diff --git a/test_problems/cathermo/HMW_graph_CpvT/.cvsignore b/test_problems/cathermo/HMW_graph_CpvT/.cvsignore
index c26dfc44d..927d015a0 100644
--- a/test_problems/cathermo/HMW_graph_CpvT/.cvsignore
+++ b/test_problems/cathermo/HMW_graph_CpvT/.cvsignore
@@ -8,4 +8,4 @@ table.csv
 Cp_standalone
 HMW_graph_CpvT
 HMW_graph_CpvT.d
-
+csvCode.txt
diff --git a/test_problems/cathermo/HMW_graph_CpvT/HMW_NaCl_sp1977_alt.xml b/test_problems/cathermo/HMW_graph_CpvT/HMW_NaCl_sp1977_alt.xml
index 1ca6c066a..48aef28df 100644
--- a/test_problems/cathermo/HMW_graph_CpvT/HMW_NaCl_sp1977_alt.xml
+++ b/test_problems/cathermo/HMW_graph_CpvT/HMW_NaCl_sp1977_alt.xml
@@ -115,13 +115,13 @@
            </floatArray>
         </NASA>
       </thermo>
-      <standardState model="waterPDSS"> 
+      <standardState model="waterIAPWS"> 
          <!--
               Molar volume in m3 kmol-1. 
               (this is from Pitzer, Peiper, and Busey. However,
                the result can be easily derived from ~ 1gm/cm**3)
+                <molarVolume> 0.018068 </molarVolume>
            -->
-         <molarVolume> 0.018068 </molarVolume>
       </standardState>
     </species>
                                        
diff --git a/test_problems/cathermo/HMW_graph_GvI/HMW_NaCl.xml b/test_problems/cathermo/HMW_graph_GvI/HMW_NaCl.xml
index 805cb342a..dc289dd9e 100644
--- a/test_problems/cathermo/HMW_graph_GvI/HMW_NaCl.xml
+++ b/test_problems/cathermo/HMW_graph_GvI/HMW_NaCl.xml
@@ -108,13 +108,13 @@
            </floatArray>
         </NASA>
       </thermo>
-      <standardState model="constant_incompressible"> 
+      <standardState model="waterIAPWS"> 
          <!--
               Molar volume in m3 kmol-1. 
               (this is from Pitzer, Peiper, and Busey. However,
                the result can be easily derived from ~ 1gm/cm**3)
+              <molarVolume> 0.018068 </molarVolume>
            -->
-         <molarVolume> 0.018068 </molarVolume>
       </standardState>
     </species>
                                        
diff --git a/test_problems/cathermo/HMW_graph_GvT/HMW_NaCl_sp1977_alt.xml b/test_problems/cathermo/HMW_graph_GvT/HMW_NaCl_sp1977_alt.xml
index 1ca6c066a..d931ebb36 100644
--- a/test_problems/cathermo/HMW_graph_GvT/HMW_NaCl_sp1977_alt.xml
+++ b/test_problems/cathermo/HMW_graph_GvT/HMW_NaCl_sp1977_alt.xml
@@ -120,8 +120,8 @@
               Molar volume in m3 kmol-1. 
               (this is from Pitzer, Peiper, and Busey. However,
                the result can be easily derived from ~ 1gm/cm**3)
+              <molarVolume> 0.018068 </molarVolume>
            -->
-         <molarVolume> 0.018068 </molarVolume>
       </standardState>
     </species>
                                        
diff --git a/test_problems/cathermo/HMW_graph_HvT/.cvsignore b/test_problems/cathermo/HMW_graph_HvT/.cvsignore
index 72f5b5172..0ee44cfb5 100644
--- a/test_problems/cathermo/HMW_graph_HvT/.cvsignore
+++ b/test_problems/cathermo/HMW_graph_HvT/.cvsignore
@@ -9,3 +9,4 @@ L_standalone
 diff_test.out
 sortAlgorithms.d
 table.csv
+csvCode.txt
diff --git a/test_problems/cathermo/HMW_graph_HvT/HMW_NaCl_sp1977_alt.xml b/test_problems/cathermo/HMW_graph_HvT/HMW_NaCl_sp1977_alt.xml
index 1ca6c066a..d931ebb36 100644
--- a/test_problems/cathermo/HMW_graph_HvT/HMW_NaCl_sp1977_alt.xml
+++ b/test_problems/cathermo/HMW_graph_HvT/HMW_NaCl_sp1977_alt.xml
@@ -120,8 +120,8 @@
               Molar volume in m3 kmol-1. 
               (this is from Pitzer, Peiper, and Busey. However,
                the result can be easily derived from ~ 1gm/cm**3)
+              <molarVolume> 0.018068 </molarVolume>
            -->
-         <molarVolume> 0.018068 </molarVolume>
       </standardState>
     </species>
                                        
diff --git a/test_problems/cathermo/HMW_graph_VvT/.cvsignore b/test_problems/cathermo/HMW_graph_VvT/.cvsignore
index da33a5c43..a65320451 100644
--- a/test_problems/cathermo/HMW_graph_VvT/.cvsignore
+++ b/test_problems/cathermo/HMW_graph_VvT/.cvsignore
@@ -9,3 +9,4 @@ V_standalone
 diff_test.out
 sortAlgorithms.d
 table.csv
+csvCode.txt
diff --git a/test_problems/cathermo/HMW_graph_VvT/HMW_NaCl_sp1977_alt.xml b/test_problems/cathermo/HMW_graph_VvT/HMW_NaCl_sp1977_alt.xml
index 1ca6c066a..d931ebb36 100644
--- a/test_problems/cathermo/HMW_graph_VvT/HMW_NaCl_sp1977_alt.xml
+++ b/test_problems/cathermo/HMW_graph_VvT/HMW_NaCl_sp1977_alt.xml
@@ -120,8 +120,8 @@
               Molar volume in m3 kmol-1. 
               (this is from Pitzer, Peiper, and Busey. However,
                the result can be easily derived from ~ 1gm/cm**3)
+              <molarVolume> 0.018068 </molarVolume>
            -->
-         <molarVolume> 0.018068 </molarVolume>
       </standardState>
     </species>
                                        
diff --git a/test_problems/cathermo/HMW_test_1/HMW_NaCl.xml b/test_problems/cathermo/HMW_test_1/HMW_NaCl.xml
index 842cbacbf..29a3c641e 100644
--- a/test_problems/cathermo/HMW_test_1/HMW_NaCl.xml
+++ b/test_problems/cathermo/HMW_test_1/HMW_NaCl.xml
@@ -92,8 +92,7 @@
            </floatArray>
         </NASA>
       </thermo>
-      <standardState model="constant_incompressible"> 
-         <molarVolume> 0.05555555 </molarVolume>
+      <standardState model="waterIAPWS"> 
       </standardState>
     </species>
                                                
diff --git a/test_problems/cathermo/HMW_test_3/HMW_NaCl_tc.xml b/test_problems/cathermo/HMW_test_3/HMW_NaCl_tc.xml
index 42ec12e84..b92643dfc 100644
--- a/test_problems/cathermo/HMW_test_3/HMW_NaCl_tc.xml
+++ b/test_problems/cathermo/HMW_test_3/HMW_NaCl_tc.xml
@@ -100,8 +100,7 @@
            </floatArray>
         </NASA>
       </thermo>
-      <standardState model="constant_incompressible"> 
-         <molarVolume> 0.05555555 </molarVolume>
+      <standardState model="waterIAPWS"> 
       </standardState>
     </species>