From 9995d5f18b9c76a8f5f296afadd3969dcd8d6fb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?=
 <34712686+asmfstatoil@users.noreply.github.com>
Date: Thu, 27 Apr 2023 16:40:29 +0200
Subject: [PATCH 1/5] style

---
 .../processEquipment/separator/sectionType/MeshSection.java     | 1 -
 .../neqsim/processSimulation/processSystem/ProcessModule.java   | 2 --
 src/main/java/neqsim/thermo/component/ComponentSrkCPAs.java     | 2 --
 src/main/java/neqsim/thermo/phase/PhaseInterface.java           | 2 --
 .../thermodynamicOperations/ThermodynamicOperationsTest.java    | 1 -
 5 files changed, 8 deletions(-)

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/MeshSection.java b/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/MeshSection.java
index 04b7267bb..69c90b521 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/MeshSection.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/MeshSection.java
@@ -27,7 +27,6 @@ public MeshSection(String name, String type, Separator sep) {
     super(name, type, sep);
   }
 
-
   /**
    * {@inheritDoc}
    *
diff --git a/src/main/java/neqsim/processSimulation/processSystem/ProcessModule.java b/src/main/java/neqsim/processSimulation/processSystem/ProcessModule.java
index 5620694ae..a714a713c 100644
--- a/src/main/java/neqsim/processSimulation/processSystem/ProcessModule.java
+++ b/src/main/java/neqsim/processSimulation/processSystem/ProcessModule.java
@@ -93,8 +93,6 @@ public List<Integer> getOperationsIndex() {
     return operationsIndex;
   }
 
-
-
   /**
    * Get the list of added process modules.
    *
diff --git a/src/main/java/neqsim/thermo/component/ComponentSrkCPAs.java b/src/main/java/neqsim/thermo/component/ComponentSrkCPAs.java
index 4e0e54645..88283a02a 100644
--- a/src/main/java/neqsim/thermo/component/ComponentSrkCPAs.java
+++ b/src/main/java/neqsim/thermo/component/ComponentSrkCPAs.java
@@ -92,7 +92,5 @@ public double calc_lngij(int j, PhaseInterface phase) {
     return (0.475 * getBij(j) * temp
         + 0.475 * ((ComponentEosInterface) phase.getComponent(j)).getBi() * 0.475 * getBi())
         / (temp * temp);
-
-
   }
 }
diff --git a/src/main/java/neqsim/thermo/phase/PhaseInterface.java b/src/main/java/neqsim/thermo/phase/PhaseInterface.java
index 689145ced..e9ba68ce1 100644
--- a/src/main/java/neqsim/thermo/phase/PhaseInterface.java
+++ b/src/main/java/neqsim/thermo/phase/PhaseInterface.java
@@ -479,7 +479,6 @@ public void removeComponent(String componentName, double moles, double molesInPh
    */
   public double getMixGibbsEnergy();
 
-
   /**
    * <p>
    * getExessGibbsEnergy.
@@ -525,7 +524,6 @@ public default double getExessGibbsEnergySymetric() {
    */
   public double getExcessGibbsEnergySymetric();
 
-
   /**
    * <p>
    * hasPlusFraction.
diff --git a/src/test/java/neqsim/thermodynamicOperations/ThermodynamicOperationsTest.java b/src/test/java/neqsim/thermodynamicOperations/ThermodynamicOperationsTest.java
index 69716f361..05cd87031 100644
--- a/src/test/java/neqsim/thermodynamicOperations/ThermodynamicOperationsTest.java
+++ b/src/test/java/neqsim/thermodynamicOperations/ThermodynamicOperationsTest.java
@@ -40,7 +40,6 @@ void testFlash() {
     }
   }
 
-
   @Test
   void testNeqSimPython() {
     SystemInterface thermoSystem = new neqsim.thermo.system.SystemSrkEos(280.0, 10.0);

From 51ecda01d2ce33353ed05a2ca7b61651abb789bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?=
 <34712686+asmfstatoil@users.noreply.github.com>
Date: Thu, 27 Apr 2023 16:41:28 +0200
Subject: [PATCH 2/5] refact: assure that it is not possible to add component
 with no name

---
 .../neqsim/thermo/component/Component.java    |  9 ++++++++-
 .../thermo/component/NewComponentTest.java    | 20 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/main/java/neqsim/thermo/component/Component.java b/src/main/java/neqsim/thermo/component/Component.java
index 9588266a2..29b9ac439 100644
--- a/src/main/java/neqsim/thermo/component/Component.java
+++ b/src/main/java/neqsim/thermo/component/Component.java
@@ -222,6 +222,14 @@ public void insertComponentIntoDatabase(String databaseName) {
   @Override
   public void createComponent(String component_name, double moles, double molesInPhase,
       int compnumber) {
+    if (component_name == null) {
+      throw new RuntimeException(new neqsim.util.exception.InvalidInputException(this,
+          "createComponent", "component_name", "can not be null"));
+    }
+    if (component_name.trim() == "") {
+      throw new RuntimeException(new neqsim.util.exception.InvalidInputException(this,
+          "createComponent", "component_name", "can not be empty"));
+    }
     component_name = ComponentInterface.getComponentNameFromAlias(component_name);
     componentName = component_name;
     numberOfMoles = moles;
@@ -2303,7 +2311,6 @@ public double getTotalFlowRate(String flowunit) {
     }
   }
 
-
   /**
    * Indexed getter for property matiascopemanParamsUMRPRU.
    *
diff --git a/src/test/java/neqsim/thermo/component/NewComponentTest.java b/src/test/java/neqsim/thermo/component/NewComponentTest.java
index da7f5bdc9..650b1ad23 100644
--- a/src/test/java/neqsim/thermo/component/NewComponentTest.java
+++ b/src/test/java/neqsim/thermo/component/NewComponentTest.java
@@ -1,8 +1,10 @@
 package neqsim.thermo.component;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import neqsim.thermo.phase.PhaseSrkEos;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
 
@@ -15,6 +17,24 @@ public class NewComponentTest extends neqsim.NeqSimTest {
   @BeforeAll
   static void setUpBeforeClass() throws Exception {}
 
+  @Test
+  public void createComponentTest() {
+    PhaseSrkEos p = new PhaseSrkEos();
+    RuntimeException thrown = Assertions.assertThrows(RuntimeException.class, () -> {
+      p.addcomponent("", 0, 0, 0);
+    });
+    Assertions.assertEquals(
+        "neqsim.util.exception.InvalidInputException: ComponentSrk:createComponent - Input component_name can not be empty",
+        thrown.getMessage());
+
+    RuntimeException thrown_2 = Assertions.assertThrows(RuntimeException.class, () -> {
+      p.addcomponent(null, 0, 0, 0);
+    });
+    Assertions.assertEquals(
+        "neqsim.util.exception.InvalidInputException: ComponentSrk:createComponent - Input component_name can not be null",
+        thrown_2.getMessage());
+  }
+
   @Test
   public void newComponentTest() {
     thermoSystem = new SystemSrkEos(298.0, 1.01325);

From d51aa399465850fc0fab98e9ff8e7385ec22ccfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?=
 <34712686+asmfstatoil@users.noreply.github.com>
Date: Thu, 27 Apr 2023 17:27:35 +0200
Subject: [PATCH 3/5] docfix

---
 src/main/java/neqsim/thermo/component/Component.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/neqsim/thermo/component/Component.java b/src/main/java/neqsim/thermo/component/Component.java
index 29b9ac439..ced6e678d 100644
--- a/src/main/java/neqsim/thermo/component/Component.java
+++ b/src/main/java/neqsim/thermo/component/Component.java
@@ -60,7 +60,9 @@ abstract class Component implements ComponentInterface {
   protected double criticalTemperature;
   protected double molarMass;
   protected double acentricFactor;
+  /** numberOfMoles = totalNumberOfMoles * z. */
   protected double numberOfMoles = 0.0;
+  /** totalNumberOfMoles * x * beta. */
   protected double numberOfMolesInPhase = 0.0;
   protected double normalLiquidDensity = 0;
   protected double reducedPressure;

From 29d42d6d5f883cdf9a4b42c39d130ce59915db79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?=
 <34712686+asmfstatoil@users.noreply.github.com>
Date: Fri, 28 Apr 2023 14:56:15 +0200
Subject: [PATCH 4/5] add test files

---
 .../neqsim/thermo/phase/PhaseBWRSEosTest.java  | 10 ++++++++++
 .../thermo/phase/PhaseCSPsrkEosTest.java       | 10 ++++++++++
 .../neqsim/thermo/phase/PhaseDefaultTest.java  | 10 ++++++++++
 .../thermo/phase/PhaseDesmukhMatherTest.java   | 10 ++++++++++
 .../neqsim/thermo/phase/PhaseDuanSunTest.java  | 10 ++++++++++
 .../phase/PhaseElectrolyteCPAOldTest.java      | 10 ++++++++++
 .../thermo/phase/PhaseElectrolyteCPATest.java  | 10 ++++++++++
 .../phase/PhaseElectrolyteCPAstatoilTest.java  | 10 ++++++++++
 .../java/neqsim/thermo/phase/PhaseEosTest.java | 10 ++++++++++
 .../neqsim/thermo/phase/PhaseGENRTLTest.java   | 10 ++++++++++
 .../phase/PhaseGENRTLmodifiedHVTest.java       | 10 ++++++++++
 .../phase/PhaseGENRTLmodifiedWSTest.java       | 10 ++++++++++
 .../thermo/phase/PhaseGERG2004EosTest.java     | 10 ++++++++++
 .../java/neqsim/thermo/phase/PhaseGETest.java  | 10 ++++++++++
 .../thermo/phase/PhaseGEUnifacPSRKTest.java    | 10 ++++++++++
 .../neqsim/thermo/phase/PhaseGEUnifacTest.java | 10 ++++++++++
 .../thermo/phase/PhaseGEUnifacUMRPRUTest.java  | 10 ++++++++++
 .../thermo/phase/PhaseGEUniquacTest.java       | 10 ++++++++++
 .../phase/PhaseGEUniquacmodifiedHVTest.java    | 10 ++++++++++
 .../neqsim/thermo/phase/PhaseGEWilsonTest.java | 10 ++++++++++
 .../neqsim/thermo/phase/PhaseHydrateTest.java  | 10 ++++++++++
 .../thermo/phase/PhaseKentEisenbergTest.java   | 10 ++++++++++
 ...ModifiedFurstElectrolyteEosMod2004Test.java | 10 ++++++++++
 .../PhaseModifiedFurstElectrolyteEosTest.java  | 10 ++++++++++
 .../thermo/phase/PhasePCSAFTRahmatTest.java    | 10 ++++++++++
 .../neqsim/thermo/phase/PhasePCSAFTTest.java   | 10 ++++++++++
 .../neqsim/thermo/phase/PhasePCSAFTaTest.java  | 10 ++++++++++
 .../neqsim/thermo/phase/PhasePrCPATest.java    | 10 ++++++++++
 .../neqsim/thermo/phase/PhasePrEosTest.java    | 10 ++++++++++
 .../thermo/phase/PhasePrEosvolcorTest.java     | 10 ++++++++++
 .../java/neqsim/thermo/phase/PhaseRKTest.java  | 10 ++++++++++
 .../neqsim/thermo/phase/PhaseSolidTest.java    | 10 ++++++++++
 .../PhaseSrkCPA_proceduralMatricesTest.java    | 10 ++++++++++
 .../thermo/phase/PhaseSrkCPAojAlgoTest.java    | 10 ++++++++++
 .../thermo/phase/PhaseSrkCPAsOldTest.java      | 10 ++++++++++
 .../neqsim/thermo/phase/PhaseSrkCPAsTest.java  | 10 ++++++++++
 .../neqsim/thermo/phase/PhaseSrkEosTest.java   | 10 ++++++++++
 .../thermo/phase/PhaseSrkPenelouxEosTest.java  | 10 ++++++++++
 .../neqsim/thermo/phase/PhaseTSTEosTest.java   | 10 ++++++++++
 .../neqsim/thermo/phase/PhaseUMRCPATest.java   | 10 ++++++++++
 .../java/neqsim/thermo/phase/PhaseWaxTest.java | 18 ++++++++++++++++++
 41 files changed, 418 insertions(+)
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseBWRSEosTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseCSPsrkEosTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseDefaultTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseDesmukhMatherTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseDuanSunTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPAOldTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPATest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPAstatoilTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseEosTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseGENRTLTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHVTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWSTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseGERG2004EosTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseGETest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseGEUnifacPSRKTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseGEUnifacTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRUTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseGEUniquacTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseGEUniquacmodifiedHVTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseGEWilsonTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseHydrateTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseKentEisenbergTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004Test.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhasePCSAFTRahmatTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhasePCSAFTTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhasePCSAFTaTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhasePrCPATest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhasePrEosTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhasePrEosvolcorTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseRKTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseSolidTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatricesTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseSrkCPAojAlgoTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseSrkCPAsOldTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseSrkCPAsTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseSrkEosTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseSrkPenelouxEosTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseTSTEosTest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseUMRCPATest.java
 create mode 100644 src/test/java/neqsim/thermo/phase/PhaseWaxTest.java

diff --git a/src/test/java/neqsim/thermo/phase/PhaseBWRSEosTest.java b/src/test/java/neqsim/thermo/phase/PhaseBWRSEosTest.java
new file mode 100644
index 000000000..48ba906aa
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseBWRSEosTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseBWRSEosTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseCSPsrkEosTest.java b/src/test/java/neqsim/thermo/phase/PhaseCSPsrkEosTest.java
new file mode 100644
index 000000000..cbc67a27a
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseCSPsrkEosTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseCSPsrkEosTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseDefaultTest.java b/src/test/java/neqsim/thermo/phase/PhaseDefaultTest.java
new file mode 100644
index 000000000..e6917da7e
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseDefaultTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseDefaultTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseDesmukhMatherTest.java b/src/test/java/neqsim/thermo/phase/PhaseDesmukhMatherTest.java
new file mode 100644
index 000000000..8397f0539
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseDesmukhMatherTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseDesmukhMatherTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseDuanSunTest.java b/src/test/java/neqsim/thermo/phase/PhaseDuanSunTest.java
new file mode 100644
index 000000000..f2a947497
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseDuanSunTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseDuanSunTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPAOldTest.java b/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPAOldTest.java
new file mode 100644
index 000000000..219c91ae9
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPAOldTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseElectrolyteCPAOldTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPATest.java b/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPATest.java
new file mode 100644
index 000000000..ee6b53827
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPATest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseElectrolyteCPATest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPAstatoilTest.java b/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPAstatoilTest.java
new file mode 100644
index 000000000..ef8893e84
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPAstatoilTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseElectrolyteCPAstatoilTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseEosTest.java b/src/test/java/neqsim/thermo/phase/PhaseEosTest.java
new file mode 100644
index 000000000..85bcda656
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseEosTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseEosTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGENRTLTest.java b/src/test/java/neqsim/thermo/phase/PhaseGENRTLTest.java
new file mode 100644
index 000000000..a6083ea17
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseGENRTLTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseGENRTLTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHVTest.java b/src/test/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHVTest.java
new file mode 100644
index 000000000..c257478e0
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHVTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseGENRTLmodifiedHVTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWSTest.java b/src/test/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWSTest.java
new file mode 100644
index 000000000..c07437671
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWSTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseGENRTLmodifiedWSTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGERG2004EosTest.java b/src/test/java/neqsim/thermo/phase/PhaseGERG2004EosTest.java
new file mode 100644
index 000000000..c6e1dc515
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseGERG2004EosTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseGERG2004EosTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGETest.java b/src/test/java/neqsim/thermo/phase/PhaseGETest.java
new file mode 100644
index 000000000..66fa68748
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseGETest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseGETest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGEUnifacPSRKTest.java b/src/test/java/neqsim/thermo/phase/PhaseGEUnifacPSRKTest.java
new file mode 100644
index 000000000..35a6ea5e7
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseGEUnifacPSRKTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseGEUnifacPSRKTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGEUnifacTest.java b/src/test/java/neqsim/thermo/phase/PhaseGEUnifacTest.java
new file mode 100644
index 000000000..0396108af
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseGEUnifacTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseGEUnifacTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRUTest.java b/src/test/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRUTest.java
new file mode 100644
index 000000000..b33362707
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRUTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseGEUnifacUMRPRUTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGEUniquacTest.java b/src/test/java/neqsim/thermo/phase/PhaseGEUniquacTest.java
new file mode 100644
index 000000000..64e06ec0c
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseGEUniquacTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseGEUniquacTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGEUniquacmodifiedHVTest.java b/src/test/java/neqsim/thermo/phase/PhaseGEUniquacmodifiedHVTest.java
new file mode 100644
index 000000000..b6171fdc9
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseGEUniquacmodifiedHVTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseGEUniquacmodifiedHVTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGEWilsonTest.java b/src/test/java/neqsim/thermo/phase/PhaseGEWilsonTest.java
new file mode 100644
index 000000000..f41853064
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseGEWilsonTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseGEWilsonTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseHydrateTest.java b/src/test/java/neqsim/thermo/phase/PhaseHydrateTest.java
new file mode 100644
index 000000000..87101ea05
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseHydrateTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseHydrateTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseKentEisenbergTest.java b/src/test/java/neqsim/thermo/phase/PhaseKentEisenbergTest.java
new file mode 100644
index 000000000..f7622ac4d
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseKentEisenbergTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseKentEisenbergTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004Test.java b/src/test/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004Test.java
new file mode 100644
index 000000000..87ffac92e
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004Test.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseModifiedFurstElectrolyteEosMod2004Test {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosTest.java b/src/test/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosTest.java
new file mode 100644
index 000000000..da5de7279
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseModifiedFurstElectrolyteEosTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhasePCSAFTRahmatTest.java b/src/test/java/neqsim/thermo/phase/PhasePCSAFTRahmatTest.java
new file mode 100644
index 000000000..9717a0761
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhasePCSAFTRahmatTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhasePCSAFTRahmatTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhasePCSAFTTest.java b/src/test/java/neqsim/thermo/phase/PhasePCSAFTTest.java
new file mode 100644
index 000000000..2342ae302
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhasePCSAFTTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhasePCSAFTTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhasePCSAFTaTest.java b/src/test/java/neqsim/thermo/phase/PhasePCSAFTaTest.java
new file mode 100644
index 000000000..faef9bdd4
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhasePCSAFTaTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhasePCSAFTaTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhasePrCPATest.java b/src/test/java/neqsim/thermo/phase/PhasePrCPATest.java
new file mode 100644
index 000000000..3f0b9aea4
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhasePrCPATest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhasePrCPATest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhasePrEosTest.java b/src/test/java/neqsim/thermo/phase/PhasePrEosTest.java
new file mode 100644
index 000000000..2f53b80e9
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhasePrEosTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhasePrEosTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhasePrEosvolcorTest.java b/src/test/java/neqsim/thermo/phase/PhasePrEosvolcorTest.java
new file mode 100644
index 000000000..1026ac8be
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhasePrEosvolcorTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhasePrEosvolcorTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseRKTest.java b/src/test/java/neqsim/thermo/phase/PhaseRKTest.java
new file mode 100644
index 000000000..6de315dc5
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseRKTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseRKTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseSolidTest.java b/src/test/java/neqsim/thermo/phase/PhaseSolidTest.java
new file mode 100644
index 000000000..5f7b5264a
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseSolidTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseSolidTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatricesTest.java b/src/test/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatricesTest.java
new file mode 100644
index 000000000..d732b9e24
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatricesTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseSrkCPA_proceduralMatricesTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseSrkCPAojAlgoTest.java b/src/test/java/neqsim/thermo/phase/PhaseSrkCPAojAlgoTest.java
new file mode 100644
index 000000000..e1c7f73b6
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseSrkCPAojAlgoTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseSrkCPAojAlgoTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseSrkCPAsOldTest.java b/src/test/java/neqsim/thermo/phase/PhaseSrkCPAsOldTest.java
new file mode 100644
index 000000000..7cdf706e8
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseSrkCPAsOldTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseSrkCPAsOldTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseSrkCPAsTest.java b/src/test/java/neqsim/thermo/phase/PhaseSrkCPAsTest.java
new file mode 100644
index 000000000..39e7aaee7
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseSrkCPAsTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseSrkCPAsTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseSrkEosTest.java b/src/test/java/neqsim/thermo/phase/PhaseSrkEosTest.java
new file mode 100644
index 000000000..a71f03dfc
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseSrkEosTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseSrkEosTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseSrkPenelouxEosTest.java b/src/test/java/neqsim/thermo/phase/PhaseSrkPenelouxEosTest.java
new file mode 100644
index 000000000..21e768f8b
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseSrkPenelouxEosTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseSrkPenelouxEosTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseTSTEosTest.java b/src/test/java/neqsim/thermo/phase/PhaseTSTEosTest.java
new file mode 100644
index 000000000..17abb939c
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseTSTEosTest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseTSTEosTest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseUMRCPATest.java b/src/test/java/neqsim/thermo/phase/PhaseUMRCPATest.java
new file mode 100644
index 000000000..8666464e2
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseUMRCPATest.java
@@ -0,0 +1,10 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Test;
+
+public class PhaseUMRCPATest {
+  @Test
+  void testAddcomponent() {
+
+  }
+}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseWaxTest.java b/src/test/java/neqsim/thermo/phase/PhaseWaxTest.java
new file mode 100644
index 000000000..0d913bf30
--- /dev/null
+++ b/src/test/java/neqsim/thermo/phase/PhaseWaxTest.java
@@ -0,0 +1,18 @@
+package neqsim.thermo.phase;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class PhaseWaxTest {
+  @Test
+  void testAddcomponent() {
+    PhaseWax p = new PhaseWax();
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addcomponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
+
+    p.addcomponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
+  }
+}

From c732909dbbe5aacaecfa1b422cc94857a19a86d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?=
 <34712686+asmfstatoil@users.noreply.github.com>
Date: Wed, 10 May 2023 15:53:18 +0200
Subject: [PATCH 5/5] test: create tests

---
 .../neqsim/thermo/phase/PhaseBWRSEosTest.java     | 15 +++++++++++++++
 .../neqsim/thermo/phase/PhaseCSPsrkEosTest.java   | 15 +++++++++++++++
 .../neqsim/thermo/phase/PhaseDefaultTest.java     | 10 ----------
 .../thermo/phase/PhaseDesmukhMatherTest.java      | 15 +++++++++++++++
 .../neqsim/thermo/phase/PhaseDuanSunTest.java     | 15 +++++++++++++++
 .../thermo/phase/PhaseElectrolyteCPAOldTest.java  | 15 +++++++++++++++
 .../thermo/phase/PhaseElectrolyteCPATest.java     | 15 +++++++++++++++
 .../phase/PhaseElectrolyteCPAstatoilTest.java     | 15 +++++++++++++++
 .../java/neqsim/thermo/phase/PhaseEosTest.java    | 10 ----------
 .../java/neqsim/thermo/phase/PhaseGENRTLTest.java | 15 +++++++++++++++
 .../thermo/phase/PhaseGENRTLmodifiedHVTest.java   | 15 +++++++++++++++
 .../thermo/phase/PhaseGENRTLmodifiedWSTest.java   | 15 +++++++++++++++
 .../java/neqsim/thermo/phase/PhaseGETest.java     | 10 ----------
 .../thermo/phase/PhaseGEUnifacPSRKTest.java       | 15 +++++++++++++++
 .../neqsim/thermo/phase/PhaseGEUnifacTest.java    | 15 +++++++++++++++
 .../thermo/phase/PhaseGEUnifacUMRPRUTest.java     | 15 +++++++++++++++
 .../neqsim/thermo/phase/PhaseGEUniquacTest.java   | 15 +++++++++++++++
 .../neqsim/thermo/phase/PhaseGEWilsonTest.java    | 15 +++++++++++++++
 .../neqsim/thermo/phase/PhaseHydrateTest.java     | 15 +++++++++++++++
 .../thermo/phase/PhaseKentEisenbergTest.java      | 15 +++++++++++++++
 ...aseModifiedFurstElectrolyteEosMod2004Test.java | 15 +++++++++++++++
 .../PhaseModifiedFurstElectrolyteEosTest.java     | 15 +++++++++++++++
 .../thermo/phase/PhasePCSAFTRahmatTest.java       | 15 +++++++++++++++
 .../java/neqsim/thermo/phase/PhasePCSAFTTest.java | 15 +++++++++++++++
 .../neqsim/thermo/phase/PhasePCSAFTaTest.java     | 15 +++++++++++++++
 .../java/neqsim/thermo/phase/PhasePrCPATest.java  | 15 +++++++++++++++
 .../java/neqsim/thermo/phase/PhasePrEosTest.java  | 15 +++++++++++++++
 .../neqsim/thermo/phase/PhasePrEosvolcorTest.java | 15 +++++++++++++++
 .../java/neqsim/thermo/phase/PhaseRKTest.java     | 15 +++++++++++++++
 .../java/neqsim/thermo/phase/PhaseSolidTest.java  | 10 ----------
 .../phase/PhaseSrkCPA_proceduralMatricesTest.java | 15 +++++++++++++++
 .../thermo/phase/PhaseSrkCPAojAlgoTest.java       | 15 +++++++++++++++
 .../neqsim/thermo/phase/PhaseSrkCPAsOldTest.java  | 15 +++++++++++++++
 .../neqsim/thermo/phase/PhaseSrkCPAsTest.java     | 15 +++++++++++++++
 .../java/neqsim/thermo/phase/PhaseSrkEosTest.java | 15 +++++++++++++++
 .../thermo/phase/PhaseSrkPenelouxEosTest.java     | 15 +++++++++++++++
 .../java/neqsim/thermo/phase/PhaseTSTEosTest.java | 15 +++++++++++++++
 .../java/neqsim/thermo/phase/PhaseUMRCPATest.java | 15 +++++++++++++++
 .../java/neqsim/thermo/phase/PhaseWaxTest.java    | 13 ++++++++++---
 39 files changed, 520 insertions(+), 43 deletions(-)
 delete mode 100644 src/test/java/neqsim/thermo/phase/PhaseDefaultTest.java
 delete mode 100644 src/test/java/neqsim/thermo/phase/PhaseEosTest.java
 delete mode 100644 src/test/java/neqsim/thermo/phase/PhaseGETest.java
 delete mode 100644 src/test/java/neqsim/thermo/phase/PhaseSolidTest.java

diff --git a/src/test/java/neqsim/thermo/phase/PhaseBWRSEosTest.java b/src/test/java/neqsim/thermo/phase/PhaseBWRSEosTest.java
index 48ba906aa..5dc3770d5 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseBWRSEosTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseBWRSEosTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseBWRSEosTest {
+  static PhaseBWRSEos p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseBWRSEos();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseCSPsrkEosTest.java b/src/test/java/neqsim/thermo/phase/PhaseCSPsrkEosTest.java
index cbc67a27a..4b9958fdf 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseCSPsrkEosTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseCSPsrkEosTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseCSPsrkEosTest {
+  static PhaseCSPsrkEos p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseCSPsrkEos();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseDefaultTest.java b/src/test/java/neqsim/thermo/phase/PhaseDefaultTest.java
deleted file mode 100644
index e6917da7e..000000000
--- a/src/test/java/neqsim/thermo/phase/PhaseDefaultTest.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package neqsim.thermo.phase;
-
-import org.junit.jupiter.api.Test;
-
-public class PhaseDefaultTest {
-  @Test
-  void testAddcomponent() {
-
-  }
-}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseDesmukhMatherTest.java b/src/test/java/neqsim/thermo/phase/PhaseDesmukhMatherTest.java
index 8397f0539..496aa9df6 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseDesmukhMatherTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseDesmukhMatherTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseDesmukhMatherTest {
+  static PhaseDesmukhMather p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseDesmukhMather();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseDuanSunTest.java b/src/test/java/neqsim/thermo/phase/PhaseDuanSunTest.java
index f2a947497..d7971df15 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseDuanSunTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseDuanSunTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseDuanSunTest {
+  static PhaseDuanSun p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseDuanSun();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPAOldTest.java b/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPAOldTest.java
index 219c91ae9..040b9f68e 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPAOldTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPAOldTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseElectrolyteCPAOldTest {
+  static PhaseElectrolyteCPAOld p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseElectrolyteCPAOld();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPATest.java b/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPATest.java
index ee6b53827..4e197f06c 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPATest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPATest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseElectrolyteCPATest {
+  static PhaseElectrolyteCPA p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseElectrolyteCPA();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPAstatoilTest.java b/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPAstatoilTest.java
index ef8893e84..c2e29a828 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPAstatoilTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseElectrolyteCPAstatoilTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseElectrolyteCPAstatoilTest {
+  static PhaseElectrolyteCPAstatoil p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseElectrolyteCPAstatoil();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseEosTest.java b/src/test/java/neqsim/thermo/phase/PhaseEosTest.java
deleted file mode 100644
index 85bcda656..000000000
--- a/src/test/java/neqsim/thermo/phase/PhaseEosTest.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package neqsim.thermo.phase;
-
-import org.junit.jupiter.api.Test;
-
-public class PhaseEosTest {
-  @Test
-  void testAddcomponent() {
-
-  }
-}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGENRTLTest.java b/src/test/java/neqsim/thermo/phase/PhaseGENRTLTest.java
index a6083ea17..617c69c01 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseGENRTLTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseGENRTLTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseGENRTLTest {
+  static PhaseGENRTL p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseGENRTL();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHVTest.java b/src/test/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHVTest.java
index c257478e0..2ea43070a 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHVTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHVTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseGENRTLmodifiedHVTest {
+  static PhaseGENRTLmodifiedHV p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseGENRTLmodifiedHV();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWSTest.java b/src/test/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWSTest.java
index c07437671..ce93b42f5 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWSTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWSTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseGENRTLmodifiedWSTest {
+  static PhaseGENRTLmodifiedWS p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseGENRTLmodifiedWS();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGETest.java b/src/test/java/neqsim/thermo/phase/PhaseGETest.java
deleted file mode 100644
index 66fa68748..000000000
--- a/src/test/java/neqsim/thermo/phase/PhaseGETest.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package neqsim.thermo.phase;
-
-import org.junit.jupiter.api.Test;
-
-public class PhaseGETest {
-  @Test
-  void testAddcomponent() {
-
-  }
-}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGEUnifacPSRKTest.java b/src/test/java/neqsim/thermo/phase/PhaseGEUnifacPSRKTest.java
index 35a6ea5e7..68fec9d31 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseGEUnifacPSRKTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseGEUnifacPSRKTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseGEUnifacPSRKTest {
+  static PhaseGEUnifacPSRK p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseGEUnifacPSRK();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGEUnifacTest.java b/src/test/java/neqsim/thermo/phase/PhaseGEUnifacTest.java
index 0396108af..d90a2fc32 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseGEUnifacTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseGEUnifacTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseGEUnifacTest {
+  static PhaseGEUnifac p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseGEUnifac();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRUTest.java b/src/test/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRUTest.java
index b33362707..b269db4fb 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRUTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRUTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseGEUnifacUMRPRUTest {
+  static PhaseGEUnifacUMRPRU p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseGEUnifacUMRPRU();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGEUniquacTest.java b/src/test/java/neqsim/thermo/phase/PhaseGEUniquacTest.java
index 64e06ec0c..9d109f4a3 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseGEUniquacTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseGEUniquacTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseGEUniquacTest {
+  static PhaseGEUniquac p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseGEUniquac();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseGEWilsonTest.java b/src/test/java/neqsim/thermo/phase/PhaseGEWilsonTest.java
index f41853064..1ac1808e8 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseGEWilsonTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseGEWilsonTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseGEWilsonTest {
+  static PhaseGEWilson p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseGEWilson();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseHydrateTest.java b/src/test/java/neqsim/thermo/phase/PhaseHydrateTest.java
index 87101ea05..f4a7814ff 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseHydrateTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseHydrateTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseHydrateTest {
+  static PhaseHydrate p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseHydrate();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseKentEisenbergTest.java b/src/test/java/neqsim/thermo/phase/PhaseKentEisenbergTest.java
index f7622ac4d..df311e250 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseKentEisenbergTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseKentEisenbergTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseKentEisenbergTest {
+  static PhaseKentEisenberg p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseKentEisenberg();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004Test.java b/src/test/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004Test.java
index 87ffac92e..8ccdf2b15 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004Test.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004Test.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseModifiedFurstElectrolyteEosMod2004Test {
+  static PhaseModifiedFurstElectrolyteEosMod2004 p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseModifiedFurstElectrolyteEosMod2004();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosTest.java b/src/test/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosTest.java
index da5de7279..125383b83 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseModifiedFurstElectrolyteEosTest {
+  static PhaseModifiedFurstElectrolyteEos p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseModifiedFurstElectrolyteEos();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhasePCSAFTRahmatTest.java b/src/test/java/neqsim/thermo/phase/PhasePCSAFTRahmatTest.java
index 9717a0761..fc8c74a00 100644
--- a/src/test/java/neqsim/thermo/phase/PhasePCSAFTRahmatTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhasePCSAFTRahmatTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhasePCSAFTRahmatTest {
+  static PhasePCSAFTRahmat p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhasePCSAFTRahmat();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhasePCSAFTTest.java b/src/test/java/neqsim/thermo/phase/PhasePCSAFTTest.java
index 2342ae302..f6e97a0be 100644
--- a/src/test/java/neqsim/thermo/phase/PhasePCSAFTTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhasePCSAFTTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhasePCSAFTTest {
+  static PhasePCSAFT p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhasePCSAFT();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhasePCSAFTaTest.java b/src/test/java/neqsim/thermo/phase/PhasePCSAFTaTest.java
index faef9bdd4..82fc574fe 100644
--- a/src/test/java/neqsim/thermo/phase/PhasePCSAFTaTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhasePCSAFTaTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhasePCSAFTaTest {
+  static PhasePCSAFTa p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhasePCSAFTa();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhasePrCPATest.java b/src/test/java/neqsim/thermo/phase/PhasePrCPATest.java
index 3f0b9aea4..69b0ef792 100644
--- a/src/test/java/neqsim/thermo/phase/PhasePrCPATest.java
+++ b/src/test/java/neqsim/thermo/phase/PhasePrCPATest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhasePrCPATest {
+  static PhasePrCPA p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhasePrCPA();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhasePrEosTest.java b/src/test/java/neqsim/thermo/phase/PhasePrEosTest.java
index 2f53b80e9..3c82904a8 100644
--- a/src/test/java/neqsim/thermo/phase/PhasePrEosTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhasePrEosTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhasePrEosTest {
+  static PhasePrEos p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhasePrEos();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhasePrEosvolcorTest.java b/src/test/java/neqsim/thermo/phase/PhasePrEosvolcorTest.java
index 1026ac8be..6a2d0c6a6 100644
--- a/src/test/java/neqsim/thermo/phase/PhasePrEosvolcorTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhasePrEosvolcorTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhasePrEosvolcorTest {
+  static PhasePrEosvolcor p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhasePrEosvolcor();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseRKTest.java b/src/test/java/neqsim/thermo/phase/PhaseRKTest.java
index 6de315dc5..6a9b08996 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseRKTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseRKTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseRKTest {
+  static PhaseRK p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseRK();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseSolidTest.java b/src/test/java/neqsim/thermo/phase/PhaseSolidTest.java
deleted file mode 100644
index 5f7b5264a..000000000
--- a/src/test/java/neqsim/thermo/phase/PhaseSolidTest.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package neqsim.thermo.phase;
-
-import org.junit.jupiter.api.Test;
-
-public class PhaseSolidTest {
-  @Test
-  void testAddcomponent() {
-
-  }
-}
diff --git a/src/test/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatricesTest.java b/src/test/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatricesTest.java
index d732b9e24..0b826d94f 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatricesTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatricesTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseSrkCPA_proceduralMatricesTest {
+  static PhaseSrkCPA_proceduralMatrices p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseSrkCPA_proceduralMatrices();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseSrkCPAojAlgoTest.java b/src/test/java/neqsim/thermo/phase/PhaseSrkCPAojAlgoTest.java
index e1c7f73b6..4d4d65baa 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseSrkCPAojAlgoTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseSrkCPAojAlgoTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseSrkCPAojAlgoTest {
+  static PhaseSrkCPAojAlgo p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseSrkCPAojAlgo();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseSrkCPAsOldTest.java b/src/test/java/neqsim/thermo/phase/PhaseSrkCPAsOldTest.java
index 7cdf706e8..c33e4912a 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseSrkCPAsOldTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseSrkCPAsOldTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseSrkCPAsOldTest {
+  static PhaseSrkCPAsOld p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseSrkCPAsOld();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseSrkCPAsTest.java b/src/test/java/neqsim/thermo/phase/PhaseSrkCPAsTest.java
index 39e7aaee7..5feccc7d0 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseSrkCPAsTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseSrkCPAsTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseSrkCPAsTest {
+  static PhaseSrkCPAs p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseSrkCPAs();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseSrkEosTest.java b/src/test/java/neqsim/thermo/phase/PhaseSrkEosTest.java
index a71f03dfc..3bf1f4471 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseSrkEosTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseSrkEosTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseSrkEosTest {
+  static PhaseSrkEos p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseSrkEos();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseSrkPenelouxEosTest.java b/src/test/java/neqsim/thermo/phase/PhaseSrkPenelouxEosTest.java
index 21e768f8b..a84d39d99 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseSrkPenelouxEosTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseSrkPenelouxEosTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseSrkPenelouxEosTest {
+  static PhaseSrkPenelouxEos p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseSrkPenelouxEos();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseTSTEosTest.java b/src/test/java/neqsim/thermo/phase/PhaseTSTEosTest.java
index 17abb939c..cbe29234e 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseTSTEosTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseTSTEosTest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseTSTEosTest {
+  static PhaseTSTEos p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseTSTEos();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseUMRCPATest.java b/src/test/java/neqsim/thermo/phase/PhaseUMRCPATest.java
index 8666464e2..711372a02 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseUMRCPATest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseUMRCPATest.java
@@ -1,10 +1,25 @@
 package neqsim.thermo.phase;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseUMRCPATest {
+  static PhaseUMRCPA p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseUMRCPA();
+  }
+
   @Test
   void testAddcomponent() {
+    Assertions.assertEquals(0, p.getNumberOfComponents());
+
+    p.addComponent("ethane", 0, 0, 0);
+    Assertions.assertEquals(1, p.getNumberOfComponents());
 
+    p.addComponent("methane", 0, 0, 0);
+    Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }
diff --git a/src/test/java/neqsim/thermo/phase/PhaseWaxTest.java b/src/test/java/neqsim/thermo/phase/PhaseWaxTest.java
index 0d913bf30..6693f1778 100644
--- a/src/test/java/neqsim/thermo/phase/PhaseWaxTest.java
+++ b/src/test/java/neqsim/thermo/phase/PhaseWaxTest.java
@@ -1,18 +1,25 @@
 package neqsim.thermo.phase;
 
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PhaseWaxTest {
+  static PhaseWax p;
+
+  @BeforeEach
+  void setUp() {
+    p = new PhaseWax();
+  }
+
   @Test
   void testAddcomponent() {
-    PhaseWax p = new PhaseWax();
     Assertions.assertEquals(0, p.getNumberOfComponents());
 
-    p.addcomponent("ethane", 0, 0, 0);
+    p.addComponent("ethane", 0, 0, 0);
     Assertions.assertEquals(1, p.getNumberOfComponents());
 
-    p.addcomponent("methane", 0, 0, 0);
+    p.addComponent("methane", 0, 0, 0);
     Assertions.assertEquals(2, p.getNumberOfComponents());
   }
 }