diff --git a/clmctest/monitoring/test_e2eresults.py b/clmctest/monitoring/test_e2eresults.py
index fea3a7769ad53b468bcb8d6a7b5a7784de333d56..18f2f81f98fbd6f17d8b64adb1773f3d1c3eb989 100644
--- a/clmctest/monitoring/test_e2eresults.py
+++ b/clmctest/monitoring/test_e2eresults.py
@@ -55,7 +55,7 @@ class TestE2ESimulation(object):
         e2e_simulator.run()
 
         print("Waiting for INFLUX to finish receiving simulation data...")
-        time.sleep(e2e_simulator.SIMULATION_LENGTH)  # wait for data to finish arriving at the INFLUX database
+        time.sleep(e2e_simulator.SIMULATION_LENGTH+10)  # wait for data to finish arriving at the INFLUX database
         print("... simulation data fixture finished")
 
         print("... stopping aggregator")
@@ -95,6 +95,8 @@ class TestE2ESimulation(object):
         # get the dictionary of result points; the next() function just gets the first element of the query results generator (we only expect one item in the generator)
         actual_result = next(query_result.get_points())
 
+        print("expected_result == actual_result {0}, {1}".format(expected_result, actual_result))
+
         assert expected_result == actual_result, "E2E Simulation test failure"
 
-        print("Successfully passed test for the following query: {0}".format(query))
+
diff --git a/setup.py b/setup.py
index ae4a06e7ffad5b567d01142d90acd0f55248109a..191d3dbb7f438a4617eda035f589329931dc73e0 100644
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@ def get_version(fname):
 
 
 setup(
-    name = "clmc",
+    name = "clmctest",
     version = get_version("clmctest/_version.py"),
     author = "Michael Boniface",
     author_email = "mjb@it-innovation.soton.ac.uk",