diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 153df38397..86ad47e2ea 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Ant-Version: Apache Ant 1.7.1
-Created-By: 20.1-b02 (Sun Microsystems Inc.)
+Created-By: 20.2-b06 (Sun Microsystems Inc.)
 Implementation-Title: Voldemort
 Implementation-Version: 0.96
 Implementation-Vendor: LinkedIn
diff --git a/test/unit/voldemort/client/AdminServiceBasicTest.java b/test/unit/voldemort/client/AdminServiceBasicTest.java
index 54cfec11ae..2dbddf1817 100644
--- a/test/unit/voldemort/client/AdminServiceBasicTest.java
+++ b/test/unit/voldemort/client/AdminServiceBasicTest.java
@@ -21,7 +21,6 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
-
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -123,18 +122,18 @@ public static Collection<Object[]> configs() {
     @Before
     public void setUp() throws IOException {
         int numServers = 2;
-        VoldemortServer[] servers = new VoldemortServer[numServers];
+        servers = new VoldemortServer[numServers];
         int partitionMap[][] = { { 0, 1, 2, 3 }, { 4, 5, 6, 7 } };
         Properties serverProperties = new Properties();
         serverProperties.setProperty("client.max.connections.per.node", "20");
-        ServerTestUtils.startVoldemortCluster(numServers,
-                                              servers,
-                                              partitionMap,
-                                              socketStoreFactory,
-                                              useNio,
-                                              null,
-                                              storesXmlfile,
-                                              serverProperties);
+        cluster = ServerTestUtils.startVoldemortCluster(numServers,
+                                                        servers,
+                                                        partitionMap,
+                                                        socketStoreFactory,
+                                                        useNio,
+                                                        null,
+                                                        storesXmlfile,
+                                                        serverProperties);
 
         storeDefs = new StoreDefinitionsMapper().readStoreList(new File(storesXmlfile));
 
diff --git a/test/unit/voldemort/cluster/failuredetector/ServerStoreVerifierTest.java b/test/unit/voldemort/cluster/failuredetector/ServerStoreVerifierTest.java
index 8b670e8eea..5f41196366 100644
--- a/test/unit/voldemort/cluster/failuredetector/ServerStoreVerifierTest.java
+++ b/test/unit/voldemort/cluster/failuredetector/ServerStoreVerifierTest.java
@@ -35,8 +35,6 @@
 import voldemort.cluster.Cluster;
 import voldemort.cluster.Node;
 import voldemort.common.service.ServiceType;
-import voldemort.server.VoldemortConfig;
-import voldemort.server.ServiceType;
 import voldemort.server.VoldemortServer;
 import voldemort.server.storage.StorageService;
 import voldemort.store.socket.SocketStoreFactory;
diff --git a/test/unit/voldemort/store/readonly/swapper/StoreSwapperTest.java b/test/unit/voldemort/store/readonly/swapper/StoreSwapperTest.java
index 7b27d438ec..aaaaf9c7bf 100644
--- a/test/unit/voldemort/store/readonly/swapper/StoreSwapperTest.java
+++ b/test/unit/voldemort/store/readonly/swapper/StoreSwapperTest.java
@@ -117,9 +117,18 @@ public void setUp() throws IOException {
         baseDirs = new File[NUM_NODES];
         for(int nodeId = 0; nodeId < NUM_NODES; nodeId++) {
             String baseDir = servers[nodeId].getVoldemortConfig().getDataDirectory();
-            baseDirs[nodeId] = new File(baseDir + "/node-" + nodeId + "/data/read-only/"
-                                        + STORE_NAME);
+            baseDirs[nodeId] = new File(baseDir + "/read-only/" + STORE_NAME);
         }
+        /*-
+        for(int nodeId = 0; nodeId < NUM_NODES; nodeId++) {
+            System.err.println("nodeId: " + nodeId);
+            System.err.println("  basedir: " + baseDirs[nodeId].getAbsolutePath());
+            System.err.println("  datadir: "
+                               + servers[nodeId].getVoldemortConfig().getDataDirectory());
+            System.err.println("  metadir: "
+                               + servers[nodeId].getVoldemortConfig().getMetadataDirectory());
+        }
+         */
 
         adminClient = ServerTestUtils.getAdminClient(cluster);