diff --git a/mps/code/commpost.nmk b/mps/code/commpost.nmk
index a205a1a618c..8383548b710 100644
--- a/mps/code/commpost.nmk
+++ b/mps/code/commpost.nmk
@@ -107,15 +107,15 @@ FORCE:
 $(PFM)\$(VARIETY)\version.obj: FORCE
 
 $(PFM)\$(VARIETY)\finalcv.exe: $(PFM)\$(VARIETY)\finalcv.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(DWOBJ) $(DWTESTOBJ) \
+	$(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(FMTTESTOBJ) \
 	$(MRGOBJ) $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\finaltest.exe: $(PFM)\$(VARIETY)\finaltest.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(DWOBJ) $(DWTESTOBJ) \
+	$(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(FMTTESTOBJ) \
 	$(MRGOBJ) $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\expt825.exe: $(PFM)\$(VARIETY)\expt825.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(DWOBJ) $(DWTESTOBJ) \
+	$(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(FMTTESTOBJ) \
 	$(MRGOBJ) $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\locv.exe:  $(PFM)\$(VARIETY)\locv.obj \
@@ -144,27 +144,27 @@ $(PFM)\$(VARIETY)\protcv.exe:  $(PFM)\$(VARIETY)\protcv.obj \
 	$(MPMOBJ) $(PLINTHOBJ)
 
 $(PFM)\$(VARIETY)\mpsicv.exe: $(PFM)\$(VARIETY)\mpsicv.obj \
-	$(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(DWOBJ) $(DWTESTOBJ) \
+	$(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
 	$(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\amcss.exe: $(PFM)\$(VARIETY)\amcss.obj \
-	$(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(DWOBJ) $(DWTESTOBJ) \
+	$(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
 	$(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\amcsshe.exe: $(PFM)\$(VARIETY)\amcsshe.obj \
-	$(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(HETESTOBJ) \
+	$(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
 	$(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\amsss.exe: $(PFM)\$(VARIETY)\amsss.obj \
-	$(MPMOBJ) $(AMSOBJ) $(PLINTHOBJ) $(DWOBJ) $(DWTESTOBJ) \
+	$(MPMOBJ) $(AMSOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
 	$(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\amssshe.exe: $(PFM)\$(VARIETY)\amssshe.obj \
-	$(MPMOBJ) $(AMSOBJ) $(PLINTHOBJ) $(HETESTOBJ) \
+	$(MPMOBJ) $(AMSOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
 	$(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\segsmss.exe: $(PFM)\$(VARIETY)\segsmss.obj \
-	$(MPMOBJ) $(AMSOBJ) $(PLINTHOBJ) $(DWOBJ) $(DWTESTOBJ) \
+	$(MPMOBJ) $(AMSOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
 	$(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\locbwcss.exe: $(PFM)\$(VARIETY)\locbwcss.obj \
@@ -175,11 +175,11 @@ $(PFM)\$(VARIETY)\dwstress.exe:  $(PFM)\$(VARIETY)\dwstress.obj \
 	$(DWOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ)
 
 $(PFM)\$(VARIETY)\awlut.exe:  $(PFM)\$(VARIETY)\awlut.obj \
-        $(DWTESTOBJ) \
+        $(FMTTESTOBJ) \
 	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) $(LOOBJ) $(AWLOBJ)
 
 $(PFM)\$(VARIETY)\awluthe.exe:  $(PFM)\$(VARIETY)\awluthe.obj \
-	$(HETESTOBJ) \
+	$(FMTTESTOBJ) \
 	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) $(LOOBJ) $(AWLOBJ)
 
 $(PFM)\$(VARIETY)\poolncv.exe:  $(PFM)\$(VARIETY)\poolncv.obj \
@@ -228,15 +228,15 @@ $(PFM)\$(VARIETY)\messtest.exe: $(PFM)\$(VARIETY)\messtest.obj \
 	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\steptest.exe: $(PFM)\$(VARIETY)\steptest.obj \
-	$(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(DWOBJ) $(DWTESTOBJ) \
+	$(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
 	$(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\walkt0.exe: $(PFM)\$(VARIETY)\walkt0.obj \
-	$(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(DWOBJ) $(DWTESTOBJ) \
+	$(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
 	$(TESTLIBOBJ)	
 
 $(PFM)\$(VARIETY)\exposet0.exe: $(PFM)\$(VARIETY)\exposet0.obj \
-	$(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(DWOBJ) $(DWTESTOBJ) \
+	$(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
 	$(TESTLIBOBJ)	
 
 $(PFM)\$(VARIETY)\mmsw.lib: $(SWOBJ)
diff --git a/mps/code/w3almv.nmk b/mps/code/w3almv.nmk
index d422a812d59..7c1c8e07b20 100644
--- a/mps/code/w3almv.nmk
+++ b/mps/code/w3almv.nmk
@@ -36,8 +36,7 @@ AMS = <poolams> <poolamsi>
 AWL = <poolawl>
 LO  = <poollo>
 DW = <fmtdy> <fmtno>
-DWTEST = <fmtdytst>
-HETEST = <fmthe> <fmtdy> <fmtno> <fmtdytst>
+FMTTEST = <fmthe> <fmtdy> <fmtno> <fmtdytst>
 POOLN = <pooln>
 TESTLIB = <testlib>
 
@@ -77,10 +76,8 @@ SNCOBJ0 = $(SNC:<=w3almv\he\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3almv\he\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3almv\he\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3almv\he\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3almv\he\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3almv\he\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3almv\he\)
@@ -108,10 +105,8 @@ SNCOBJ0 = $(SNC:<=w3almv\ce\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3almv\ce\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3almv\ce\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3almv\ce\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3almv\ce\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3almv\ce\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3almv\ce\)
@@ -139,10 +134,8 @@ SNCOBJ0 = $(SNC:<=w3almv\hi\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3almv\hi\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3almv\hi\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3almv\hi\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3almv\hi\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3almv\hi\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3almv\hi\)
@@ -170,10 +163,8 @@ SNCOBJ0 = $(SNC:<=w3almv\ci\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3almv\ci\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3almv\ci\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3almv\ci\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3almv\ci\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3almv\ci\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3almv\ci\)
@@ -201,10 +192,8 @@ SNCOBJ0 = $(SNC:<=w3almv\ti\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3almv\ti\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3almv\ti\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3almv\ti\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3almv\ti\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3almv\ti\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3almv\ti\)
@@ -232,10 +221,8 @@ SNCOBJ0 = $(SNC:<=w3almv\wi\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3almv\wi\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3almv\wi\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3almv\wi\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3almv\wi\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3almv\wi\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3almv\wi\)
@@ -263,10 +250,8 @@ SNCOBJ0 = $(SNC:<=w3almv\we\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3almv\we\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3almv\we\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3almv\we\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3almv\we\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3almv\we\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3almv\we\)
diff --git a/mps/code/w3i3mv.nmk b/mps/code/w3i3mv.nmk
index 3f2c8cfce50..f738fa19735 100644
--- a/mps/code/w3i3mv.nmk
+++ b/mps/code/w3i3mv.nmk
@@ -37,8 +37,7 @@ AWL = <poolawl>
 LO = <poollo>
 SNC = <poolsnc>
 DW = <fmtdy> <fmtno>
-DWTEST = <fmtdytst>
-HETEST = <fmthe> <fmtdy> <fmtno> <fmtdytst>
+FMTTEST = <fmthe> <fmtdy> <fmtno> <fmtdytst>
 POOLN = <pooln>
 TESTLIB = <testlib>
 
@@ -77,10 +76,8 @@ SNCOBJ0 = $(SNC:<=w3i3mv\he\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3i3mv\he\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3i3mv\he\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3i3mv\he\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\he\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3i3mv\he\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\he\)
@@ -108,10 +105,8 @@ SNCOBJ0 = $(SNC:<=w3i3mv\ce\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3i3mv\ce\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3i3mv\ce\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3i3mv\ce\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ce\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3i3mv\ce\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ce\)
@@ -139,10 +134,8 @@ SNCOBJ0 = $(SNC:<=w3i3mv\hi\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3i3mv\hi\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3i3mv\hi\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3i3mv\hi\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\hi\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3i3mv\hi\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\hi\)
@@ -170,10 +163,8 @@ SNCOBJ0 = $(SNC:<=w3i3mv\ci\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3i3mv\ci\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3i3mv\ci\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3i3mv\ci\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ci\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3i3mv\ci\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ci\)
@@ -201,10 +192,8 @@ SNCOBJ0 = $(SNC:<=w3i3mv\ti\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3i3mv\ti\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3i3mv\ti\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3i3mv\ti\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ti\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3i3mv\ti\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ti\)
@@ -232,10 +221,8 @@ SNCOBJ0 = $(SNC:<=w3i3mv\wi\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3i3mv\wi\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3i3mv\wi\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3i3mv\wi\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\wi\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3i3mv\wi\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\wi\)
@@ -263,10 +250,8 @@ SNCOBJ0 = $(SNC:<=w3i3mv\we\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3i3mv\we\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3i3mv\we\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3i3mv\we\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\we\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3i3mv\we\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\we\)
diff --git a/mps/code/w3ppmv.nmk b/mps/code/w3ppmv.nmk
index 9b95fd2c336..f75131a576e 100644
--- a/mps/code/w3ppmv.nmk
+++ b/mps/code/w3ppmv.nmk
@@ -33,8 +33,7 @@ AMS = <poolams> <poolamsi>
 AWL = <poolawl>
 LO = <poollo>
 DW = <fmtdy> <fmtno>
-DWTEST = <fmtdytst>
-HETEST = <fmthe> <fmtdy> <fmtno> <fmtdytst>
+FMTTEST = <fmthe> <fmtdy> <fmtno> <fmtdytst>
 POOLN = <pooln>
 TESTLIB = <testlib>
 
@@ -74,10 +73,8 @@ SNCOBJ0 = $(SNC:<=w3ppmv\he\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3ppmv\he\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3ppmv\he\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3ppmv\he\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3ppmv\he\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3ppmv\he\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\he\)
@@ -105,10 +102,8 @@ SNCOBJ0 = $(SNC:<=w3ppmv\ce\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3ppmv\ce\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3ppmv\ce\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3ppmv\ce\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3ppmv\ce\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3ppmv\ce\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\ce\)
@@ -136,10 +131,8 @@ SNCOBJ0 = $(SNC:<=w3ppmv\hi\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3ppmv\hi\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3ppmv\hi\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3ppmv\hi\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3ppmv\hi\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3ppmv\hi\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\hi\)
@@ -167,10 +160,8 @@ SNCOBJ0 = $(SNC:<=w3ppmv\ci\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3ppmv\ci\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3ppmv\ci\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3ppmv\ci\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3ppmv\ci\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3ppmv\ci\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\ci\)
@@ -198,10 +189,8 @@ SNCOBJ0 = $(SNC:<=w3ppmv\ti\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3ppmv\ti\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3ppmv\ti\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3ppmv\ti\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3ppmv\ti\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3ppmv\ti\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\ti\)
@@ -229,10 +218,8 @@ SNCOBJ0 = $(SNC:<=w3ppmv\wi\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3ppmv\wi\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3ppmv\wi\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3ppmv\wi\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3ppmv\wi\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3ppmv\wi\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\wi\)
@@ -260,10 +247,8 @@ SNCOBJ0 = $(SNC:<=w3ppmv\we\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3ppmv\we\)
 DWOBJ = $(DWOBJ0:>=.obj)
-DWTESTOBJ0 = $(DWTEST:<=w3ppmv\we\)
-DWTESTOBJ = $(DWTESTOBJ0:>=.obj)
-HETESTOBJ0 = $(HETEST:<=w3ppmv\we\)
-HETESTOBJ = $(HETESTOBJ0:>=.obj)
+FMTTESTOBJ0 = $(FMTTEST:<=w3ppmv\we\)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3ppmv\we\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\we\)