Replace intercircuit tests with black box tests in configs

data/config/CDMUnitTests.config

@@ -136,8 +136,10 @@ FluidCircuit = CDMUnitTest
 ThermalCircuit = CDMUnitTest
 ElectricalCircuit = CDMUnitTest
 CombinedCircuit = CDMUnitTest
-InterCircuitComparison = CDMUnitTest
-InterCircuitIndividual = CDMUnitTest Results=InterCircuitIndividual1,InterCircuitIndividual2
+BasicBlackBoxComparisonTest = CDMUnitTest
+BasicBlackBoxTest = CDMUnitTest
+SimpleBlackBoxTest = CDMUnitTest
+WindkesselBlackBoxTest = CDMUnitTest
 DynamicallyChangingCircuit = CDMUnitTest
 NonZeroReferenceNegative = CDMUnitTest
 NonZeroReferencePositive = CDMUnitTest

src/cpp/test/main.cpp

@@ -115,10 +115,10 @@ int main(int argc, char* argv[])
       //cdmTest.GasTransportTest(cdmDir);
       
       // BlackBox Tests
-      //cdmTest.BasicBlackBoxComparisonTest(cdmDir);
+      cdmTest.BasicBlackBoxComparisonTest(cdmDir);
       //cdmTest.BasicBlackBoxTest(cdmDir);
       cdmTest.SimpleBlackBoxTest(cdmDir);
-      //cdmTest.WindkesselBlackBoxTest(cdmDir);
+      cdmTest.WindkesselBlackBoxTest(cdmDir);
 
       // I/O Tests
       //cdmTest.ReadPatientDirectory(cdmDir);