diff --git a/src/main/java/com/yahoo/omid/tso/TSOServer.java b/src/main/java/com/yahoo/omid/tso/TSOServer.java
index 7d26599d..6a708084 100644
--- a/src/main/java/com/yahoo/omid/tso/TSOServer.java
+++ b/src/main/java/com/yahoo/omid/tso/TSOServer.java
@@ -16,22 +16,13 @@
 
 package com.yahoo.omid.tso;
 
-import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.bookkeeper.client.BKException;
-import org.apache.bookkeeper.client.BookKeeper;
-import org.apache.bookkeeper.client.LedgerHandle;
-import org.apache.commons.lang.StringUtils;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.ZooKeeper;
-import org.jboss.netty.bootstrap.ClientBootstrap;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.jboss.netty.bootstrap.ServerBootstrap;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelFactory;
@@ -45,13 +36,7 @@
 import org.jboss.netty.handler.codec.serialization.ObjectEncoder;
 import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
 
-import com.yahoo.omid.tso.serialization.TSODecoder;
-import com.yahoo.omid.tso.serialization.TSOEncoder;
 import com.yahoo.omid.tso.persistence.BookKeeperStateBuilder;
-import com.yahoo.omid.tso.persistence.StateBuilder;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * TSO Server with serialization
@@ -157,7 +142,7 @@ public void run() {
         // Create the monitor
         ThroughputMonitor monitor = new ThroughputMonitor(state);
         // Add the parent channel to the group
-        Channel channel = bootstrap.bind(new InetSocketAddress(config.getPort())));
+        Channel channel = bootstrap.bind(new InetSocketAddress(config.getPort()));
         channelGroup.add(channel);
         
         // Compacter handler
diff --git a/src/test/java/com/yahoo/omid/TestAbortTransaction.java b/src/test/java/com/yahoo/omid/TestAbortTransaction.java
index f9e41f06..2d92118d 100644
--- a/src/test/java/com/yahoo/omid/TestAbortTransaction.java
+++ b/src/test/java/com/yahoo/omid/TestAbortTransaction.java
@@ -4,16 +4,11 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 import com.yahoo.omid.client.TransactionManager;
diff --git a/src/test/java/com/yahoo/omid/TestBasicTransaction.java b/src/test/java/com/yahoo/omid/TestBasicTransaction.java
index 0695955a..f03f84d0 100644
--- a/src/test/java/com/yahoo/omid/TestBasicTransaction.java
+++ b/src/test/java/com/yahoo/omid/TestBasicTransaction.java
@@ -20,18 +20,13 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.client.Delete;
 import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 import com.yahoo.omid.client.TransactionManager;
diff --git a/src/test/java/com/yahoo/omid/TestSingleColumnFamily.java b/src/test/java/com/yahoo/omid/TestSingleColumnFamily.java
index 58092ac7..d6e2e22a 100644
--- a/src/test/java/com/yahoo/omid/TestSingleColumnFamily.java
+++ b/src/test/java/com/yahoo/omid/TestSingleColumnFamily.java
@@ -20,16 +20,11 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 import com.yahoo.omid.client.TransactionManager;
diff --git a/src/test/java/com/yahoo/omid/TestTransactionConflict.java b/src/test/java/com/yahoo/omid/TestTransactionConflict.java
index 4ea4fe86..1b7518f9 100644
--- a/src/test/java/com/yahoo/omid/TestTransactionConflict.java
+++ b/src/test/java/com/yahoo/omid/TestTransactionConflict.java
@@ -21,18 +21,13 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.client.Delete;
 import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 import com.yahoo.omid.client.CommitUnsuccessfulException;
diff --git a/src/test/java/com/yahoo/omid/tso/TSOTestBase.java b/src/test/java/com/yahoo/omid/tso/TSOTestBase.java
index bf063518..7aa1abee 100644
--- a/src/test/java/com/yahoo/omid/tso/TSOTestBase.java
+++ b/src/test/java/com/yahoo/omid/tso/TSOTestBase.java
@@ -98,8 +98,6 @@ public static void teardownClient() {
       channelFactory.releaseExternalResources();
    }
 
-   static LocalBookKeeper localBK;
-   
    @BeforeClass
    public static void setupBookkeeper() throws Exception {
       System.out.println("PATH : "
@@ -113,7 +111,7 @@ public void run() {
                   String[] args = new String[1];
                   args[0] = "5";
                   LOG.info("Starting bk");
-                  localBK.main(args);
+                  LocalBookKeeper.main(args);
                } catch (InterruptedException e) {
                   // go away quietly
                } catch (Exception e) {
@@ -151,7 +149,7 @@ public void setupTSO() throws Exception {
         */
        Thread.sleep(500);
        
-      tso = new TSOServer(1234, 0, 4, 2, new String("localhost:2181"));
+      tso = new TSOServer(TSOServerConfig.configFactory(1234, 0, false, 4, 2, new String("localhost:2181")));
       tsothread = new Thread(tso);
       
       LOG.info("Starting TSO");
diff --git a/src/test/java/com/yahoo/omid/tso/TestCommitReport.java b/src/test/java/com/yahoo/omid/tso/TestCommitReport.java
index 4ccb0d7a..fa2d573c 100644
--- a/src/test/java/com/yahoo/omid/tso/TestCommitReport.java
+++ b/src/test/java/com/yahoo/omid/tso/TestCommitReport.java
@@ -18,11 +18,9 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.objectweb.asm.Opcodes.NEW;
 
 import org.junit.Test;
 
-import com.yahoo.omid.tso.RowKey;
 import com.yahoo.omid.tso.messages.CommitRequest;
 import com.yahoo.omid.tso.messages.CommitResponse;
 import com.yahoo.omid.tso.messages.CommittedTransactionReport;
diff --git a/src/test/java/com/yahoo/omid/tso/TestPersistence.java b/src/test/java/com/yahoo/omid/tso/TestPersistence.java
index 94b004d9..02423dc9 100644
--- a/src/test/java/com/yahoo/omid/tso/TestPersistence.java
+++ b/src/test/java/com/yahoo/omid/tso/TestPersistence.java
@@ -19,20 +19,16 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.junit.Test;
 
-import com.yahoo.omid.tso.RowKey;
-import com.yahoo.omid.tso.messages.AbortedTransactionReport;
 import com.yahoo.omid.tso.messages.CommitRequest;
 import com.yahoo.omid.tso.messages.CommitResponse;
 import com.yahoo.omid.tso.messages.CommittedTransactionReport;
-import com.yahoo.omid.tso.messages.FullAbortReport;
 import com.yahoo.omid.tso.messages.TimestampRequest;
 import com.yahoo.omid.tso.messages.TimestampResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 public class TestPersistence extends TSOTestBase {
     private static final Log LOG = LogFactory.getLog(TestPersistence.class);
    
diff --git a/src/test/java/com/yahoo/omid/tso/TestTimestamps.java b/src/test/java/com/yahoo/omid/tso/TestTimestamps.java
index 602b588e..2f53a24c 100644
--- a/src/test/java/com/yahoo/omid/tso/TestTimestamps.java
+++ b/src/test/java/com/yahoo/omid/tso/TestTimestamps.java
@@ -20,7 +20,6 @@
 
 import org.junit.Test;
 
-import com.yahoo.omid.tso.messages.CommittedTransactionReport;
 import com.yahoo.omid.tso.messages.TimestampRequest;
 import com.yahoo.omid.tso.messages.TimestampResponse;