Remove old tests and add lost gerrit changes

Change-Id: Ia0a1c7ea55512febf30385d1aeb4c5715f2d3721
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 5de8e2e..c4e9149 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -604,7 +604,7 @@
             ~/<self.home>/tools/test/cells/
         """
         # Variable initialization
-        cellDirectory = self.home + "/tools/test/cells/"
+        cellDirectory = os.environ["ONOS_ROOT"] + "/tools/test/cells/"
         # We want to create the cell file in the dependencies directory
         # of TestON first, then copy over to ONOS bench
         tempDirectory = "/tmp/"