diff --git a/test/Record.py b/awips/test/Record.py
similarity index 94%
rename from test/Record.py
rename to awips/test/Record.py
index 784474a..e7b19c1 100644
--- a/test/Record.py
+++ b/awips/test/Record.py
@@ -1,7 +1,3 @@
-##
-##
-
-
 #
 # Pure python logging mechanism for logging to AlertViz from
 # pure python (ie not JEP).  DO NOT USE IN PYTHON CALLED
@@ -28,4 +24,4 @@ class Record():
         self.exc_text="TEST"
 
     def getMessage(self):
-        return self.message
\ No newline at end of file
+        return self.message
diff --git a/test/Test b/awips/test/Test
similarity index 98%
rename from test/Test
rename to awips/test/Test
index 3755062..7f8c36c 100644
--- a/test/Test
+++ b/awips/test/Test
@@ -1,7 +1,3 @@
-##
-##
-
-
 #
 # Pure python logging mechanism for logging to AlertViz from
 # pure python (ie not JEP).  DO NOT USE IN PYTHON CALLED
diff --git a/test/__init__.py b/awips/test/__init__.py
similarity index 97%
rename from test/__init__.py
rename to awips/test/__init__.py
index 54f92eb..eb6a6cc 100644
--- a/test/__init__.py
+++ b/awips/test/__init__.py
@@ -1,7 +1,3 @@
-##
-##
-
-
 #
 # __init__.py for awips package
 #
diff --git a/dafTests/__init__.py b/awips/test/dafTests/__init__.py
similarity index 100%
rename from dafTests/__init__.py
rename to awips/test/dafTests/__init__.py
diff --git a/dafTests/baseBufrMosTestCase.py b/awips/test/dafTests/baseBufrMosTestCase.py
similarity index 100%
rename from dafTests/baseBufrMosTestCase.py
rename to awips/test/dafTests/baseBufrMosTestCase.py
diff --git a/dafTests/baseDafTestCase.py b/awips/test/dafTests/baseDafTestCase.py
similarity index 100%
rename from dafTests/baseDafTestCase.py
rename to awips/test/dafTests/baseDafTestCase.py
diff --git a/dafTests/baseRadarTestCase.py b/awips/test/dafTests/baseRadarTestCase.py
similarity index 100%
rename from dafTests/baseRadarTestCase.py
rename to awips/test/dafTests/baseRadarTestCase.py
diff --git a/awips/test/dafTests/dafTests.py b/awips/test/dafTests/dafTests.py
new file mode 100644
index 0000000..a34b482
--- /dev/null
+++ b/awips/test/dafTests/dafTests.py
@@ -0,0 +1,11 @@
+from testClimate import ClimateTestCase
+
+geomData = ClimateTestCase.testGetGeometryData
+for record in geomData:
+    print(record.getGeometry())
+print(dir(ClimateTestCase.testGetGeometryDataWithEnvelopeThrowsException))
+print(dir(ClimateTestCase.testGetGeometryDataForYearAndDayOfYearTable))
+print(dir(ClimateTestCase.testGetGeometryDataForPeriodTable))
+print(dir(ClimateTestCase.testGetGeometryDataForDateTable))
+print(dir(ClimateTestCase.testGetGeometryDataWithShortParameter))
+print(dir(ClimateTestCase.testGetDataWithTimeRangeWithForDateTable))
\ No newline at end of file
diff --git a/dafTests/params.py b/awips/test/dafTests/params.py
similarity index 100%
rename from dafTests/params.py
rename to awips/test/dafTests/params.py
diff --git a/dafTests/testAcars.py b/awips/test/dafTests/testAcars.py
similarity index 100%
rename from dafTests/testAcars.py
rename to awips/test/dafTests/testAcars.py
diff --git a/dafTests/testAirep.py b/awips/test/dafTests/testAirep.py
similarity index 100%
rename from dafTests/testAirep.py
rename to awips/test/dafTests/testAirep.py
diff --git a/dafTests/testBinLightning.py b/awips/test/dafTests/testBinLightning.py
similarity index 100%
rename from dafTests/testBinLightning.py
rename to awips/test/dafTests/testBinLightning.py
diff --git a/dafTests/testBufrMosAvn.py b/awips/test/dafTests/testBufrMosAvn.py
similarity index 100%
rename from dafTests/testBufrMosAvn.py
rename to awips/test/dafTests/testBufrMosAvn.py
diff --git a/dafTests/testBufrMosEta.py b/awips/test/dafTests/testBufrMosEta.py
similarity index 100%
rename from dafTests/testBufrMosEta.py
rename to awips/test/dafTests/testBufrMosEta.py
diff --git a/dafTests/testBufrMosGfs.py b/awips/test/dafTests/testBufrMosGfs.py
similarity index 100%
rename from dafTests/testBufrMosGfs.py
rename to awips/test/dafTests/testBufrMosGfs.py
diff --git a/dafTests/testBufrMosHpc.py b/awips/test/dafTests/testBufrMosHpc.py
similarity index 100%
rename from dafTests/testBufrMosHpc.py
rename to awips/test/dafTests/testBufrMosHpc.py
diff --git a/dafTests/testBufrMosLamp.py b/awips/test/dafTests/testBufrMosLamp.py
similarity index 100%
rename from dafTests/testBufrMosLamp.py
rename to awips/test/dafTests/testBufrMosLamp.py
diff --git a/dafTests/testBufrMosMrf.py b/awips/test/dafTests/testBufrMosMrf.py
similarity index 100%
rename from dafTests/testBufrMosMrf.py
rename to awips/test/dafTests/testBufrMosMrf.py
diff --git a/dafTests/testBufrUa.py b/awips/test/dafTests/testBufrUa.py
similarity index 100%
rename from dafTests/testBufrUa.py
rename to awips/test/dafTests/testBufrUa.py
diff --git a/dafTests/testClimate.py b/awips/test/dafTests/testClimate.py
similarity index 99%
rename from dafTests/testClimate.py
rename to awips/test/dafTests/testClimate.py
index 82aa86d..a2dfd79 100644
--- a/dafTests/testClimate.py
+++ b/awips/test/dafTests/testClimate.py
@@ -1,6 +1,3 @@
-##
-##
-
 from __future__ import print_function
 import datetime
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
diff --git a/dafTests/testCombinedTimeQuery.py b/awips/test/dafTests/testCombinedTimeQuery.py
similarity index 100%
rename from dafTests/testCombinedTimeQuery.py
rename to awips/test/dafTests/testCombinedTimeQuery.py
diff --git a/dafTests/testCommonObsSpatial.py b/awips/test/dafTests/testCommonObsSpatial.py
similarity index 100%
rename from dafTests/testCommonObsSpatial.py
rename to awips/test/dafTests/testCommonObsSpatial.py
diff --git a/dafTests/testDataTime.py b/awips/test/dafTests/testDataTime.py
similarity index 100%
rename from dafTests/testDataTime.py
rename to awips/test/dafTests/testDataTime.py
diff --git a/dafTests/testFfmp.py b/awips/test/dafTests/testFfmp.py
similarity index 100%
rename from dafTests/testFfmp.py
rename to awips/test/dafTests/testFfmp.py
diff --git a/dafTests/testGfe.py b/awips/test/dafTests/testGfe.py
similarity index 100%
rename from dafTests/testGfe.py
rename to awips/test/dafTests/testGfe.py
diff --git a/dafTests/testGfeEditArea.py b/awips/test/dafTests/testGfeEditArea.py
similarity index 100%
rename from dafTests/testGfeEditArea.py
rename to awips/test/dafTests/testGfeEditArea.py
diff --git a/dafTests/testGrid.py b/awips/test/dafTests/testGrid.py
similarity index 100%
rename from dafTests/testGrid.py
rename to awips/test/dafTests/testGrid.py
diff --git a/dafTests/testHydro.py b/awips/test/dafTests/testHydro.py
similarity index 100%
rename from dafTests/testHydro.py
rename to awips/test/dafTests/testHydro.py
diff --git a/dafTests/testLdadMesonet.py b/awips/test/dafTests/testLdadMesonet.py
similarity index 100%
rename from dafTests/testLdadMesonet.py
rename to awips/test/dafTests/testLdadMesonet.py
diff --git a/dafTests/testMaps.py b/awips/test/dafTests/testMaps.py
similarity index 100%
rename from dafTests/testMaps.py
rename to awips/test/dafTests/testMaps.py
diff --git a/dafTests/testModelSounding.py b/awips/test/dafTests/testModelSounding.py
similarity index 100%
rename from dafTests/testModelSounding.py
rename to awips/test/dafTests/testModelSounding.py
diff --git a/dafTests/testObs.py b/awips/test/dafTests/testObs.py
similarity index 100%
rename from dafTests/testObs.py
rename to awips/test/dafTests/testObs.py
diff --git a/dafTests/testPirep.py b/awips/test/dafTests/testPirep.py
similarity index 100%
rename from dafTests/testPirep.py
rename to awips/test/dafTests/testPirep.py
diff --git a/dafTests/testPracticeWarning.py b/awips/test/dafTests/testPracticeWarning.py
similarity index 100%
rename from dafTests/testPracticeWarning.py
rename to awips/test/dafTests/testPracticeWarning.py
diff --git a/dafTests/testProfiler.py b/awips/test/dafTests/testProfiler.py
similarity index 100%
rename from dafTests/testProfiler.py
rename to awips/test/dafTests/testProfiler.py
diff --git a/dafTests/testRadarGraphics.py b/awips/test/dafTests/testRadarGraphics.py
similarity index 100%
rename from dafTests/testRadarGraphics.py
rename to awips/test/dafTests/testRadarGraphics.py
diff --git a/dafTests/testRadarGrid.py b/awips/test/dafTests/testRadarGrid.py
similarity index 100%
rename from dafTests/testRadarGrid.py
rename to awips/test/dafTests/testRadarGrid.py
diff --git a/dafTests/testRadarSpatial.py b/awips/test/dafTests/testRadarSpatial.py
similarity index 100%
rename from dafTests/testRadarSpatial.py
rename to awips/test/dafTests/testRadarSpatial.py
diff --git a/dafTests/testRequestConstraint.py b/awips/test/dafTests/testRequestConstraint.py
similarity index 100%
rename from dafTests/testRequestConstraint.py
rename to awips/test/dafTests/testRequestConstraint.py
diff --git a/dafTests/testSatellite.py b/awips/test/dafTests/testSatellite.py
similarity index 100%
rename from dafTests/testSatellite.py
rename to awips/test/dafTests/testSatellite.py
diff --git a/dafTests/testSfcObs.py b/awips/test/dafTests/testSfcObs.py
similarity index 100%
rename from dafTests/testSfcObs.py
rename to awips/test/dafTests/testSfcObs.py
diff --git a/dafTests/testTopo.py b/awips/test/dafTests/testTopo.py
similarity index 100%
rename from dafTests/testTopo.py
rename to awips/test/dafTests/testTopo.py
diff --git a/dafTests/testWarning.py b/awips/test/dafTests/testWarning.py
similarity index 100%
rename from dafTests/testWarning.py
rename to awips/test/dafTests/testWarning.py
diff --git a/test/localization/__init__.py b/awips/test/localization/__init__.py
similarity index 100%
rename from test/localization/__init__.py
rename to awips/test/localization/__init__.py
diff --git a/test/localization/testLocalizationFileManager.py b/awips/test/localization/testLocalizationFileManager.py
similarity index 100%
rename from test/localization/testLocalizationFileManager.py
rename to awips/test/localization/testLocalizationFileManager.py
diff --git a/test/localization/testLocalizationRest.py b/awips/test/localization/testLocalizationRest.py
similarity index 100%
rename from test/localization/testLocalizationRest.py
rename to awips/test/localization/testLocalizationRest.py
diff --git a/test/testQpidTimeToLive.py b/awips/test/testQpidTimeToLive.py
similarity index 99%
rename from test/testQpidTimeToLive.py
rename to awips/test/testQpidTimeToLive.py
index 15d4df5..f91e2af 100644
--- a/test/testQpidTimeToLive.py
+++ b/awips/test/testQpidTimeToLive.py
@@ -1,6 +1,3 @@
-##
-##
-
 #
 #
 #