diff --git a/awips/test/dafTests/__init__.py b/dafTests/__init__.py
similarity index 100%
rename from awips/test/dafTests/__init__.py
rename to dafTests/__init__.py
diff --git a/awips/test/dafTests/baseBufrMosTestCase.py b/dafTests/baseBufrMosTestCase.py
similarity index 100%
rename from awips/test/dafTests/baseBufrMosTestCase.py
rename to dafTests/baseBufrMosTestCase.py
diff --git a/awips/test/dafTests/baseDafTestCase.py b/dafTests/baseDafTestCase.py
similarity index 99%
rename from awips/test/dafTests/baseDafTestCase.py
rename to dafTests/baseDafTestCase.py
index 3cf5de4..623c10a 100644
--- a/awips/test/dafTests/baseDafTestCase.py
+++ b/dafTests/baseDafTestCase.py
@@ -60,7 +60,7 @@ class DafTestCase(unittest.TestCase):
     def setUpClass(cls):
         host = os.environ.get('DAF_TEST_HOST')
         if host is None:
-            host = 'localhost'
+            host = 'edex-cloud.unidata.ucar.edu'
         DAL.changeEDEXHost(host)
 
     @staticmethod
diff --git a/awips/test/dafTests/baseRadarTestCase.py b/dafTests/baseRadarTestCase.py
similarity index 100%
rename from awips/test/dafTests/baseRadarTestCase.py
rename to dafTests/baseRadarTestCase.py
diff --git a/awips/test/dafTests/params.py b/dafTests/params.py
similarity index 100%
rename from awips/test/dafTests/params.py
rename to dafTests/params.py
diff --git a/awips/test/dafTests/testAcars.py b/dafTests/testAcars.py
similarity index 100%
rename from awips/test/dafTests/testAcars.py
rename to dafTests/testAcars.py
diff --git a/awips/test/dafTests/testAirep.py b/dafTests/testAirep.py
similarity index 100%
rename from awips/test/dafTests/testAirep.py
rename to dafTests/testAirep.py
diff --git a/awips/test/dafTests/testBinLightning.py b/dafTests/testBinLightning.py
similarity index 100%
rename from awips/test/dafTests/testBinLightning.py
rename to dafTests/testBinLightning.py
diff --git a/awips/test/dafTests/testBufrMosAvn.py b/dafTests/testBufrMosAvn.py
similarity index 100%
rename from awips/test/dafTests/testBufrMosAvn.py
rename to dafTests/testBufrMosAvn.py
diff --git a/awips/test/dafTests/testBufrMosEta.py b/dafTests/testBufrMosEta.py
similarity index 100%
rename from awips/test/dafTests/testBufrMosEta.py
rename to dafTests/testBufrMosEta.py
diff --git a/awips/test/dafTests/testBufrMosGfs.py b/dafTests/testBufrMosGfs.py
similarity index 100%
rename from awips/test/dafTests/testBufrMosGfs.py
rename to dafTests/testBufrMosGfs.py
diff --git a/awips/test/dafTests/testBufrMosHpc.py b/dafTests/testBufrMosHpc.py
similarity index 100%
rename from awips/test/dafTests/testBufrMosHpc.py
rename to dafTests/testBufrMosHpc.py
diff --git a/awips/test/dafTests/testBufrMosLamp.py b/dafTests/testBufrMosLamp.py
similarity index 100%
rename from awips/test/dafTests/testBufrMosLamp.py
rename to dafTests/testBufrMosLamp.py
diff --git a/awips/test/dafTests/testBufrMosMrf.py b/dafTests/testBufrMosMrf.py
similarity index 100%
rename from awips/test/dafTests/testBufrMosMrf.py
rename to dafTests/testBufrMosMrf.py
diff --git a/awips/test/dafTests/testBufrUa.py b/dafTests/testBufrUa.py
similarity index 100%
rename from awips/test/dafTests/testBufrUa.py
rename to dafTests/testBufrUa.py
diff --git a/awips/test/dafTests/testClimate.py b/dafTests/testClimate.py
similarity index 100%
rename from awips/test/dafTests/testClimate.py
rename to dafTests/testClimate.py
diff --git a/awips/test/dafTests/testCombinedTimeQuery.py b/dafTests/testCombinedTimeQuery.py
similarity index 96%
rename from awips/test/dafTests/testCombinedTimeQuery.py
rename to dafTests/testCombinedTimeQuery.py
index 83ae0f4..c9f53b9 100644
--- a/awips/test/dafTests/testCombinedTimeQuery.py
+++ b/dafTests/testCombinedTimeQuery.py
@@ -27,7 +27,7 @@ class CombinedTimeQueryTestCase(unittest.TestCase):
     def setUp(cls):
         host = os.environ.get('DAF_TEST_HOST')
         if host is None:
-            host = 'localhost'
+            host = 'edex-cloud.unidata.ucar.edu'
         DAL.changeEDEXHost(host)
 
     def testSuccessfulQuery(self):
diff --git a/awips/test/dafTests/testCommonObsSpatial.py b/dafTests/testCommonObsSpatial.py
similarity index 100%
rename from awips/test/dafTests/testCommonObsSpatial.py
rename to dafTests/testCommonObsSpatial.py
diff --git a/awips/test/dafTests/testDataTime.py b/dafTests/testDataTime.py
similarity index 100%
rename from awips/test/dafTests/testDataTime.py
rename to dafTests/testDataTime.py
diff --git a/awips/test/dafTests/testFfmp.py b/dafTests/testFfmp.py
similarity index 100%
rename from awips/test/dafTests/testFfmp.py
rename to dafTests/testFfmp.py
diff --git a/awips/test/dafTests/testGfe.py b/dafTests/testGfe.py
similarity index 100%
rename from awips/test/dafTests/testGfe.py
rename to dafTests/testGfe.py
diff --git a/awips/test/dafTests/testGfeEditArea.py b/dafTests/testGfeEditArea.py
similarity index 100%
rename from awips/test/dafTests/testGfeEditArea.py
rename to dafTests/testGfeEditArea.py
diff --git a/awips/test/dafTests/testGrid.py b/dafTests/testGrid.py
similarity index 100%
rename from awips/test/dafTests/testGrid.py
rename to dafTests/testGrid.py
diff --git a/awips/test/dafTests/testHydro.py b/dafTests/testHydro.py
similarity index 100%
rename from awips/test/dafTests/testHydro.py
rename to dafTests/testHydro.py
diff --git a/awips/test/dafTests/testLdadMesonet.py b/dafTests/testLdadMesonet.py
similarity index 100%
rename from awips/test/dafTests/testLdadMesonet.py
rename to dafTests/testLdadMesonet.py
diff --git a/awips/test/dafTests/testMaps.py b/dafTests/testMaps.py
similarity index 100%
rename from awips/test/dafTests/testMaps.py
rename to dafTests/testMaps.py
diff --git a/awips/test/dafTests/testModelSounding.py b/dafTests/testModelSounding.py
similarity index 100%
rename from awips/test/dafTests/testModelSounding.py
rename to dafTests/testModelSounding.py
diff --git a/awips/test/dafTests/testObs.py b/dafTests/testObs.py
similarity index 100%
rename from awips/test/dafTests/testObs.py
rename to dafTests/testObs.py
diff --git a/awips/test/dafTests/testPirep.py b/dafTests/testPirep.py
similarity index 100%
rename from awips/test/dafTests/testPirep.py
rename to dafTests/testPirep.py
diff --git a/awips/test/dafTests/testPracticeWarning.py b/dafTests/testPracticeWarning.py
similarity index 100%
rename from awips/test/dafTests/testPracticeWarning.py
rename to dafTests/testPracticeWarning.py
diff --git a/awips/test/dafTests/testProfiler.py b/dafTests/testProfiler.py
similarity index 100%
rename from awips/test/dafTests/testProfiler.py
rename to dafTests/testProfiler.py
diff --git a/awips/test/dafTests/testRadarGraphics.py b/dafTests/testRadarGraphics.py
similarity index 100%
rename from awips/test/dafTests/testRadarGraphics.py
rename to dafTests/testRadarGraphics.py
diff --git a/awips/test/dafTests/testRadarGrid.py b/dafTests/testRadarGrid.py
similarity index 100%
rename from awips/test/dafTests/testRadarGrid.py
rename to dafTests/testRadarGrid.py
diff --git a/awips/test/dafTests/testRadarSpatial.py b/dafTests/testRadarSpatial.py
similarity index 100%
rename from awips/test/dafTests/testRadarSpatial.py
rename to dafTests/testRadarSpatial.py
diff --git a/awips/test/dafTests/testRequestConstraint.py b/dafTests/testRequestConstraint.py
similarity index 100%
rename from awips/test/dafTests/testRequestConstraint.py
rename to dafTests/testRequestConstraint.py
diff --git a/awips/test/dafTests/testSatellite.py b/dafTests/testSatellite.py
similarity index 100%
rename from awips/test/dafTests/testSatellite.py
rename to dafTests/testSatellite.py
diff --git a/awips/test/dafTests/testSfcObs.py b/dafTests/testSfcObs.py
similarity index 100%
rename from awips/test/dafTests/testSfcObs.py
rename to dafTests/testSfcObs.py
diff --git a/awips/test/dafTests/testTopo.py b/dafTests/testTopo.py
similarity index 100%
rename from awips/test/dafTests/testTopo.py
rename to dafTests/testTopo.py
diff --git a/awips/test/dafTests/testWarning.py b/dafTests/testWarning.py
similarity index 100%
rename from awips/test/dafTests/testWarning.py
rename to dafTests/testWarning.py
diff --git a/awips/test/Record.py b/test/Record.py
similarity index 100%
rename from awips/test/Record.py
rename to test/Record.py
diff --git a/awips/test/Test b/test/Test
similarity index 100%
rename from awips/test/Test
rename to test/Test
diff --git a/awips/test/__init__.py b/test/__init__.py
similarity index 100%
rename from awips/test/__init__.py
rename to test/__init__.py
diff --git a/awips/test/localization/__init__.py b/test/localization/__init__.py
similarity index 100%
rename from awips/test/localization/__init__.py
rename to test/localization/__init__.py
diff --git a/awips/test/localization/testLocalizationFileManager.py b/test/localization/testLocalizationFileManager.py
similarity index 100%
rename from awips/test/localization/testLocalizationFileManager.py
rename to test/localization/testLocalizationFileManager.py
diff --git a/awips/test/localization/testLocalizationRest.py b/test/localization/testLocalizationRest.py
similarity index 100%
rename from awips/test/localization/testLocalizationRest.py
rename to test/localization/testLocalizationRest.py
diff --git a/awips/test/testQpidTimeToLive.py b/test/testQpidTimeToLive.py
similarity index 100%
rename from awips/test/testQpidTimeToLive.py
rename to test/testQpidTimeToLive.py