--- a/javacommons/javastorage/tsrc/java_api/javasrc/com/nokia/mj/test/storage/TestOTATable.java	Mon Oct 04 11:29:25 2010 +0300
+++ b/javacommons/javastorage/tsrc/java_api/javasrc/com/nokia/mj/test/storage/TestOTATable.java	Fri Oct 15 12:29:39 2010 +0300
@@ -21,7 +21,7 @@
 import com.nokia.mj.test.storage.utils.StorageSessionTestUtils;
 import com.nokia.mj.impl.storage.*;
 
-import com.nokia.mj.impl.installer.utils.InstallerMain;
+import com.nokia.mj.impl.rt.test.UnitTestSuiteCreator;
 import j2meunit.framework.Test;
 import j2meunit.framework.TestCase;
 import j2meunit.framework.TestMethod;
@@ -31,22 +31,12 @@
  * StorageSession OTA table specific test cases. See test methods for test
  * case details.
  */
-public class TestOTATable extends TestCase implements InstallerMain, StorageNames
+public class TestOTATable extends TestCase implements UnitTestSuiteCreator, StorageNames
 {
-    /**
-     * Directory for JavaStorage tests.
-     */
-    private static final String iTestRoot = "./jstest";
-
-    /**
-     * Directory for JavaStorage journal and temp files.
-     */
-    private static final String iIsRoot = iTestRoot + "/js";
-
     private StorageSession iSession = null;
     private StorageSessionTestUtils iJtu = null;
 
-    public void installerMain(String[] args)
+    public TestSuite createTestSuite(String[] args)
     {
         TestSuite suite = new TestSuite(this.getClass().getName());
 
@@ -58,7 +48,7 @@
             }
         }));
 
-        com.nokia.mj.impl.utils.OmjTestRunner.run(suite);
+        return suite;
     }
 
     public TestOTATable()