diff --git a/addons/folo/model-java/src/test/java/org/commonjava/indy/folo/model/TrackedContentEntryTest.java b/addons/folo/model-java/src/test/java/org/commonjava/indy/folo/model/TrackedContentEntryTest.java
index a707454101..2a6192de27 100644
--- a/addons/folo/model-java/src/test/java/org/commonjava/indy/folo/model/TrackedContentEntryTest.java
+++ b/addons/folo/model-java/src/test/java/org/commonjava/indy/folo/model/TrackedContentEntryTest.java
@@ -157,6 +157,8 @@ public void serializeRoundTrip_CurrentVersion()
                                          entry.getOriginUrl(), entry.getPath(), entry.getEffect(), entry.getSize(),
                                          entry.getMd5(), entry.getSha1(), entry.getSha256() );
 
+        test.setTimestamps( entry.getTimestamps() );
+
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream oos = new ObjectOutputStream( baos );
         oos.writeObject( entry );
diff --git a/embedder/pom.xml b/embedder/pom.xml
index 3a2f21a62b..af12bf553c 100644
--- a/embedder/pom.xml
+++ b/embedder/pom.xml
@@ -420,7 +420,7 @@
           <configuration>
             <startNativeTransport>true</startNativeTransport>
             <cqlVersion>3.4.4</cqlVersion>
-            <maxMemory>1024</maxMemory>
+            <maxMemory>2048</maxMemory>
           </configuration>
         </plugin>
         <plugin>
diff --git a/ftests/common/src/main/java/org/commonjava/indy/ftest/core/AbstractIndyFunctionalTest.java b/ftests/common/src/main/java/org/commonjava/indy/ftest/core/AbstractIndyFunctionalTest.java
index eca7bce439..228eb1660d 100644
--- a/ftests/common/src/main/java/org/commonjava/indy/ftest/core/AbstractIndyFunctionalTest.java
+++ b/ftests/common/src/main/java/org/commonjava/indy/ftest/core/AbstractIndyFunctionalTest.java
@@ -193,6 +193,7 @@ protected int getTestTimeoutMultiplier()
     public void stop()
             throws IndyLifecycleException
     {
+        dropKeyspace();
         closeCacheProvider();
         closeQuietly( fixture );
         closeQuietly( client );
@@ -201,7 +202,6 @@ public void stop()
     // TODO: this is a hack due to the "shutdown action not executed" issue. Once propulsor lifecycle shutdown is applied, this can be replaced.
     private void closeCacheProvider()
     {
-        dropKeyspace();
         if ( cacheProvider != null )
         {
             cacheProvider.asAdminView().close();
@@ -225,6 +225,7 @@ private void dropKeyspace()
                 logger.warn( "Failed to drop keyspace: {}, reason: {}", keyspace, ex );
             }
         }
+        cassandraClient.close();
     }
 
     protected void sleepAndRunFileGC( long milliseconds )
diff --git a/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java b/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java
index 8b981270f0..4a9d824150 100644
--- a/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java
+++ b/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java
@@ -37,6 +37,8 @@ public class CassandraClient
 
     private Session session;
 
+    private Cluster cluster;
+
     public CassandraClient()
     {
     }
@@ -67,7 +69,9 @@ private void init()
                 logger.debug( "Build with credentials, user: {}, pass: ****", username );
                 builder.withCredentials( username, password );
             }
-            Cluster cluster = builder.build();
+
+            cluster.getConfiguration().getSocketOptions().setConnectTimeoutMillis( 30000 );
+            cluster = builder.build();
 
             logger.debug( "Connecting to Cassandra, host:{}, port:{}", host, port );
             session = cluster.connect();
@@ -82,4 +86,19 @@ public Session getSession()
     {
         return session;
     }
+
+    private volatile boolean closed;
+
+    public void close()
+    {
+        if ( !closed && cluster != null && session != null )
+        {
+            logger.debug( "Close cassandra client" );
+            session.close();
+            cluster.close();
+            session = null;
+            cluster = null;
+            closed = true;
+        }
+    }
 }