Code Review / controller.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Speed up ShardManagerTest
[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / datastore / shardmanager / ShardManagerTest.java
diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java
index 2f98ec6916d23ce7ca9a62a90610f38ad74c99c2..048c0c84b5a0faab80c81f8bd143c148a91c0690 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java
@@ -35,8 +35,8 @@ import akka.japi.Creator;
 import akka.pattern.Patterns;
 import akka.persistence.RecoveryCompleted;
 import akka.serialization.Serialization;
-import akka.testkit.JavaTestKit;
 import akka.testkit.TestActorRef;
+import akka.testkit.javadsl.TestKit;
 import akka.util.Timeout;
 import com.google.common.base.Function;
 import com.google.common.base.Stopwatch;
@@ -58,6 +58,8 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.opendaylight.controller.cluster.access.concepts.MemberName;
@@ -133,8 +135,20 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     private static final MemberName MEMBER_2 = MemberName.forName("member-2");
     private static final MemberName MEMBER_3 = MemberName.forName("member-3");
 
+    private static SchemaContext TEST_SCHEMA_CONTEXT;
+
     private final String shardMgrID = ShardManagerIdentifier.builder().type(shardMrgIDSuffix).build().toString();
 
+    @BeforeClass
+    public static void beforeClass() {
+        TEST_SCHEMA_CONTEXT = TestModel.createTestContext();
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        TEST_SCHEMA_CONTEXT = null;
+    }
+
     private ActorSystem newActorSystem(final String config) {
         return newActorSystem("cluster-test", config);
     }
@@ -192,7 +206,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     private static void waitForShardInitialized(final ActorRef shardManager, final String shardName,
-            final JavaTestKit kit) {
+            final TestKit kit) {
         AssertionError last = null;
         Stopwatch sw = Stopwatch.createStarted();
         while (sw.elapsed(TimeUnit.SECONDS) <= 5) {
@@ -211,8 +225,8 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @SuppressWarnings("unchecked")
-    private static <T> T expectMsgClassOrFailure(final Class<T> msgClass, final JavaTestKit kit, final String msg) {
-        Object reply = kit.expectMsgAnyClassOf(JavaTestKit.duration("5 sec"), msgClass, Failure.class);
+    private static <T> T expectMsgClassOrFailure(final Class<T> msgClass, final TestKit kit, final String msg) {
+        Object reply = kit.expectMsgAnyClassOf(kit.duration("5 sec"), msgClass, Failure.class);
         if (reply instanceof Failure) {
             throw new AssertionError(msg + " failed", ((Failure)reply).cause());
         }
@@ -220,7 +234,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         return (T)reply;
     }
 
-    //@Test
+    @Test
     public void testPerShardDatastoreContext() throws Exception {
         LOG.info("testPerShardDatastoreContext starting");
         final DatastoreContextFactory mockFactory = newDatastoreContextFactory(
@@ -280,19 +294,19 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         final Creator<ShardManager> creator = new Creator<ShardManager>() {
             private static final long serialVersionUID = 1L;
             @Override
-            public ShardManager create() throws Exception {
+            public ShardManager create() {
                 return new LocalShardManager(
                         new GenericCreator<>(LocalShardManager.class).datastoreContextFactory(mockFactory)
                                 .primaryShardInfoCache(primaryShardInfoCache).configuration(mockConfig));
             }
         };
 
-        JavaTestKit kit = new JavaTestKit(getSystem());
+        TestKit kit = new TestKit(getSystem());
 
         final ActorRef shardManager = actorFactory.createActor(Props.create(
                 new DelegatingShardManagerCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()));
 
-        shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), kit.getRef());
+        shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef());
 
         assertEquals("Shard actors created", true, newShardActorLatch.await(5, TimeUnit.SECONDS));
         assertEquals("getShardElectionTimeoutFactor", 6,
@@ -322,13 +336,13 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testPerShardDatastoreContext ending");
     }
 
-    //@Test
-    public void testOnReceiveFindPrimaryForNonExistentShard() throws Exception {
-        new JavaTestKit(getSystem()) {
+    @Test
+    public void testOnReceiveFindPrimaryForNonExistentShard() {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
 
                 shardManager.tell(new FindPrimary("non-existent", false), getRef());
 
@@ -337,16 +351,16 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         };
     }
 
-    //@Test
-    public void testOnReceiveFindPrimaryForLocalLeaderShard() throws Exception {
+    @Test
+    public void testOnReceiveFindPrimaryForLocalLeaderShard() {
         LOG.info("testOnReceiveFindPrimaryForLocalLeaderShard starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 String memberId = "member-1-shard-default-" + shardMrgIDSuffix;
 
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager.tell(new ActorInitialized(), mockShardActor);
 
                 DataTree mockDataTree = mock(DataTree.class);
@@ -371,14 +385,14 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testOnReceiveFindPrimaryForLocalLeaderShard ending");
     }
 
-    //@Test
-    public void testOnReceiveFindPrimaryForNonLocalLeaderShardBeforeMemberUp() throws Exception {
+    @Test
+    public void testOnReceiveFindPrimaryForNonLocalLeaderShardBeforeMemberUp() {
         LOG.info("testOnReceiveFindPrimaryForNonLocalLeaderShardBeforeMemberUp starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager.tell(new ActorInitialized(), mockShardActor);
 
                 String memberId2 = "member-2-shard-default-" + shardMrgIDSuffix;
@@ -398,14 +412,14 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testOnReceiveFindPrimaryForNonLocalLeaderShardBeforeMemberUp ending");
     }
 
-    //@Test
-    public void testOnReceiveFindPrimaryForNonLocalLeaderShard() throws Exception {
+    @Test
+    public void testOnReceiveFindPrimaryForNonLocalLeaderShard() {
         LOG.info("testOnReceiveFindPrimaryForNonLocalLeaderShard starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager.tell(new ActorInitialized(), mockShardActor);
 
                 String memberId2 = "member-2-shard-default-" + shardMrgIDSuffix;
@@ -431,9 +445,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testOnReceiveFindPrimaryForNonLocalLeaderShard ending");
     }
 
-    //@Test
-    public void testOnReceiveFindPrimaryForUninitializedShard() throws Exception {
-        new JavaTestKit(getSystem()) {
+    @Test
+    public void testOnReceiveFindPrimaryForUninitializedShard() {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
@@ -444,13 +458,13 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         };
     }
 
-    //@Test
-    public void testOnReceiveFindPrimaryForInitializedShardWithNoRole() throws Exception {
-        new JavaTestKit(getSystem()) {
+    @Test
+    public void testOnReceiveFindPrimaryForInitializedShardWithNoRole() {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager.tell(new ActorInitialized(), mockShardActor);
 
                 shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, false), getRef());
@@ -460,14 +474,14 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         };
     }
 
-    //@Test
-    public void testOnReceiveFindPrimaryForFollowerShardWithNoInitialLeaderId() throws Exception {
+    @Test
+    public void testOnReceiveFindPrimaryForFollowerShardWithNoInitialLeaderId() {
         LOG.info("testOnReceiveFindPrimaryForFollowerShardWithNoInitialLeaderId starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager.tell(new ActorInitialized(), mockShardActor);
 
                 String memberId = "member-1-shard-default-" + shardMrgIDSuffix;
@@ -496,15 +510,15 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testOnReceiveFindPrimaryForFollowerShardWithNoInitialLeaderId starting");
     }
 
-    //@Test
-    public void testOnReceiveFindPrimaryWaitForShardLeader() throws Exception {
+    @Test
+    public void testOnReceiveFindPrimaryWaitForShardLeader() {
         LOG.info("testOnReceiveFindPrimaryWaitForShardLeader starting");
         datastoreContextBuilder.shardInitializationTimeout(10, TimeUnit.SECONDS);
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
 
                 // We're passing waitUntilInitialized = true to FindPrimary so
                 // the response should be
@@ -542,14 +556,14 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testOnReceiveFindPrimaryWaitForShardLeader ending");
     }
 
-    //@Test
-    public void testOnReceiveFindPrimaryWaitForReadyWithUninitializedShard() throws Exception {
+    @Test
+    public void testOnReceiveFindPrimaryWaitForReadyWithUninitializedShard() {
         LOG.info("testOnReceiveFindPrimaryWaitForReadyWithUninitializedShard starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
 
                 shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, true), getRef());
 
@@ -564,14 +578,14 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testOnReceiveFindPrimaryWaitForReadyWithUninitializedShard ending");
     }
 
-    //@Test
-    public void testOnReceiveFindPrimaryWaitForReadyWithCandidateShard() throws Exception {
+    @Test
+    public void testOnReceiveFindPrimaryWaitForReadyWithCandidateShard() {
         LOG.info("testOnReceiveFindPrimaryWaitForReadyWithCandidateShard starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager.tell(new ActorInitialized(), mockShardActor);
                 shardManager.tell(new RoleChangeNotification("member-1-shard-default-" + shardMrgIDSuffix, null,
                         RaftState.Candidate.name()), mockShardActor);
@@ -585,14 +599,14 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testOnReceiveFindPrimaryWaitForReadyWithCandidateShard ending");
     }
 
-    //@Test
-    public void testOnReceiveFindPrimaryWaitForReadyWithIsolatedLeaderShard() throws Exception {
+    @Test
+    public void testOnReceiveFindPrimaryWaitForReadyWithIsolatedLeaderShard() {
         LOG.info("testOnReceiveFindPrimaryWaitForReadyWithIsolatedLeaderShard starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager.tell(new ActorInitialized(), mockShardActor);
                 shardManager.tell(new RoleChangeNotification("member-1-shard-default-" + shardMrgIDSuffix, null,
                         RaftState.IsolatedLeader.name()), mockShardActor);
@@ -606,14 +620,14 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testOnReceiveFindPrimaryWaitForReadyWithIsolatedLeaderShard ending");
     }
 
-    //@Test
-    public void testOnReceiveFindPrimaryWaitForReadyWithNoRoleShard() throws Exception {
+    @Test
+    public void testOnReceiveFindPrimaryWaitForReadyWithNoRoleShard() {
         LOG.info("testOnReceiveFindPrimaryWaitForReadyWithNoRoleShard starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager.tell(new ActorInitialized(), mockShardActor);
 
                 shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, true), getRef());
@@ -626,7 +640,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testOnReceiveFindPrimaryForRemoteShard() throws Exception {
+    public void testOnReceiveFindPrimaryForRemoteShard() {
         LOG.info("testOnReceiveFindPrimaryForRemoteShard starting");
         String shardManagerID = ShardManagerIdentifier.builder().type(shardMrgIDSuffix).build().toString();
 
@@ -657,10 +671,10 @@ public class ShardManagerTest extends AbstractShardManagerTest {
                         new ClusterWrapperImpl(system2)).props().withDispatcher(
                                 Dispatchers.DefaultDispatcherId()), shardManagerID);
 
-        new JavaTestKit(system1) {
+        new TestKit(system1) {
             {
-                shardManager1.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
-                shardManager2.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager1.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
+                shardManager2.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
 
                 shardManager2.tell(new ActorInitialized(), mockShardActor2);
 
@@ -698,8 +712,8 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testOnReceiveFindPrimaryForRemoteShard ending");
     }
 
-    //@Test
-    public void testShardAvailabilityOnChangeOfMemberReachability() throws Exception {
+    @Test
+    public void testShardAvailabilityOnChangeOfMemberReachability() {
         LOG.info("testShardAvailabilityOnChangeOfMemberReachability starting");
         String shardManagerID = ShardManagerIdentifier.builder().type(shardMrgIDSuffix).build().toString();
 
@@ -731,10 +745,10 @@ public class ShardManagerTest extends AbstractShardManagerTest {
                         new ClusterWrapperImpl(system2)).props().withDispatcher(
                                 Dispatchers.DefaultDispatcherId()), shardManagerID);
 
-        new JavaTestKit(system1) {
+        new TestKit(system1) {
             {
-                shardManager1.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
-                shardManager2.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager1.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
+                shardManager2.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager1.tell(new ActorInitialized(), mockShardActor1);
                 shardManager2.tell(new ActorInitialized(), mockShardActor2);
 
@@ -820,8 +834,8 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testShardAvailabilityOnChangeOfMemberReachability ending");
     }
 
-    //@Test
-    public void testShardAvailabilityChangeOnMemberUnreachableAndLeadershipChange() throws Exception {
+    @Test
+    public void testShardAvailabilityChangeOnMemberUnreachableAndLeadershipChange() {
         LOG.info("testShardAvailabilityChangeOnMemberUnreachableAndLeadershipChange starting");
         String shardManagerID = ShardManagerIdentifier.builder().type(shardMrgIDSuffix).build().toString();
 
@@ -855,10 +869,10 @@ public class ShardManagerTest extends AbstractShardManagerTest {
                         new ClusterWrapperImpl(system2)).props().withDispatcher(
                                 Dispatchers.DefaultDispatcherId()), shardManagerID);
 
-        new JavaTestKit(system1) {
+        new TestKit(system1) {
             {
-                shardManager1.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
-                shardManager2.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager1.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
+                shardManager2.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager1.tell(new ActorInitialized(), mockShardActor1);
                 shardManager2.tell(new ActorInitialized(), mockShardActor2);
 
@@ -915,8 +929,8 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testShardAvailabilityChangeOnMemberUnreachableAndLeadershipChange ending");
     }
 
-    //@Test
-    public void testShardAvailabilityChangeOnMemberWithNameContainedInLeaderIdUnreachable() throws Exception {
+    @Test
+    public void testShardAvailabilityChangeOnMemberWithNameContainedInLeaderIdUnreachable() {
         LOG.info("testShardAvailabilityChangeOnMemberWithNameContainedInLeaderIdUnreachable starting");
         String shardManagerID = ShardManagerIdentifier.builder().type(shardMrgIDSuffix).build().toString();
 
@@ -955,10 +969,10 @@ public class ShardManagerTest extends AbstractShardManagerTest {
                         new ClusterWrapperImpl(system2)).props().withDispatcher(
                                 Dispatchers.DefaultDispatcherId()), shardManagerID);
 
-        new JavaTestKit(system256) {
+        new TestKit(system256) {
             {
-                shardManager256.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
-                shardManager2.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager256.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
+                shardManager2.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager256.tell(new ActorInitialized(), mockShardActor256);
                 shardManager2.tell(new ActorInitialized(), mockShardActor2);
 
@@ -1016,13 +1030,13 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testShardAvailabilityChangeOnMemberWithNameContainedInLeaderIdUnreachable ending");
     }
 
-    //@Test
-    public void testOnReceiveFindLocalShardForNonExistentShard() throws Exception {
-        new JavaTestKit(getSystem()) {
+    @Test
+    public void testOnReceiveFindLocalShardForNonExistentShard() {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
 
                 shardManager.tell(new FindLocalShard("non-existent", false), getRef());
 
@@ -1033,13 +1047,13 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         };
     }
 
-    //@Test
-    public void testOnReceiveFindLocalShardForExistentShard() throws Exception {
-        new JavaTestKit(getSystem()) {
+    @Test
+    public void testOnReceiveFindLocalShardForExistentShard() {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager.tell(new ActorInitialized(), mockShardActor);
 
                 shardManager.tell(new FindLocalShard(Shard.DEFAULT_NAME, false), getRef());
@@ -1052,9 +1066,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         };
     }
 
-    //@Test
-    public void testOnReceiveFindLocalShardForNotInitializedShard() throws Exception {
-        new JavaTestKit(getSystem()) {
+    @Test
+    public void testOnReceiveFindLocalShardForNotInitializedShard() {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
@@ -1065,14 +1079,14 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         };
     }
 
-    //@Test
+    @Test
     public void testOnReceiveFindLocalShardWaitForShardInitialized() throws Exception {
         LOG.info("testOnReceiveFindLocalShardWaitForShardInitialized starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
 
                 // We're passing waitUntilInitialized = true to FindLocalShard
                 // so the response should be
@@ -1090,7 +1104,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testOnReceiveFindLocalShardWaitForShardInitialized starting");
     }
 
-    //@Test
+    @Test
     public void testRoleChangeNotificationAndShardLeaderStateChangedReleaseReady() throws Exception {
         TestShardManager shardManager = newTestShardManager();
 
@@ -1106,9 +1120,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         verify(ready, times(1)).countDown();
     }
 
-    //@Test
+    @Test
     public void testRoleChangeNotificationToFollowerWithShardLeaderStateChangedReleaseReady() throws Exception {
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 TestShardManager shardManager = newTestShardManager();
 
@@ -1129,9 +1143,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         };
     }
 
-    //@Test
+    @Test
     public void testReadyCountDownForMemberUpAfterLeaderStateChanged() throws Exception {
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 TestShardManager shardManager = newTestShardManager();
 
@@ -1152,7 +1166,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         };
     }
 
-    //@Test
+    @Test
     public void testRoleChangeNotificationDoNothingForUnknownShard() throws Exception {
         TestShardManager shardManager = newTestShardManager();
 
@@ -1162,14 +1176,14 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         verify(ready, never()).countDown();
     }
 
-    //@Test
-    public void testByDefaultSyncStatusIsFalse() throws Exception {
+    @Test
+    public void testByDefaultSyncStatusIsFalse() {
         TestShardManager shardManager = newTestShardManager();
 
         assertEquals(false, shardManager.getMBean().getSyncStatus());
     }
 
-    //@Test
+    @Test
     public void testWhenShardIsLeaderSyncStatusIsTrue() throws Exception {
         TestShardManager shardManager = newTestShardManager();
 
@@ -1179,7 +1193,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         assertEquals(true, shardManager.getMBean().getSyncStatus());
     }
 
-    //@Test
+    @Test
     public void testWhenShardIsCandidateSyncStatusIsFalse() throws Exception {
         TestShardManager shardManager = newTestShardManager();
 
@@ -1196,7 +1210,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         assertEquals(false, shardManager.getMBean().getSyncStatus());
     }
 
-    //@Test
+    @Test
     public void testWhenShardIsFollowerSyncStatusDependsOnFollowerInitialSyncStatus() throws Exception {
         TestShardManager shardManager = newTestShardManager();
 
@@ -1219,7 +1233,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
 
     }
 
-    //@Test
+    @Test
     public void testWhenMultipleShardsPresentSyncStatusMustBeTrueForAllShards() throws Exception {
         LOG.info("testWhenMultipleShardsPresentSyncStatusMustBeTrueForAllShards starting");
         TestShardManager shardManager = newTestShardManager(newShardMgrProps(new MockConfiguration() {
@@ -1264,13 +1278,13 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testWhenMultipleShardsPresentSyncStatusMustBeTrueForAllShards ending");
     }
 
-    //@Test
-    public void testOnReceiveSwitchShardBehavior() throws Exception {
-        new JavaTestKit(getSystem()) {
+    @Test
+    public void testOnReceiveSwitchShardBehavior() {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager.tell(new ActorInitialized(), mockShardActor);
 
                 shardManager.tell(new SwitchShardBehavior(mockShardName, RaftState.Leader, 1000), getRef());
@@ -1288,10 +1302,10 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         return Arrays.asList(names).stream().map(MemberName::forName).collect(Collectors.toList());
     }
 
-    //@Test
+    @Test
     public void testOnCreateShard() {
         LOG.info("testOnCreateShard starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 datastoreContextBuilder.shardInitializationTimeout(1, TimeUnit.MINUTES).persistent(true);
 
@@ -1299,7 +1313,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
                         .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider()))
                                 .withDispatcher(Dispatchers.DefaultDispatcherId()));
 
-                SchemaContext schemaContext = TestModel.createTestContext();
+                SchemaContext schemaContext = TEST_SCHEMA_CONTEXT;
                 shardManager.tell(new UpdateSchemaContext(schemaContext), ActorRef.noSender());
 
                 DatastoreContext datastoreContext = DatastoreContext.newBuilder().shardElectionTimeoutFactor(100)
@@ -1340,10 +1354,10 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testOnCreateShard ending");
     }
 
-    //@Test
+    @Test
     public void testOnCreateShardWithLocalMemberNotInShardConfig() {
         LOG.info("testOnCreateShardWithLocalMemberNotInShardConfig starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 datastoreContextBuilder.shardInitializationTimeout(1, TimeUnit.MINUTES).persistent(true);
 
@@ -1351,7 +1365,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
                         .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider()))
                                 .withDispatcher(Dispatchers.DefaultDispatcherId()));
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), ActorRef.noSender());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), ActorRef.noSender());
 
                 Shard.Builder shardBuilder = Shard.builder();
                 ModuleShardConfiguration config = new ModuleShardConfiguration(URI.create("foo-ns"), "foo-module",
@@ -1372,10 +1386,10 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testOnCreateShardWithLocalMemberNotInShardConfig ending");
     }
 
-    //@Test
+    @Test
     public void testOnCreateShardWithNoInitialSchemaContext() {
         LOG.info("testOnCreateShardWithNoInitialSchemaContext starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 ActorRef shardManager = actorFactory
                         .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider()))
@@ -1389,7 +1403,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
 
                 expectMsgClass(duration("5 seconds"), Success.class);
 
-                SchemaContext schemaContext = TestModel.createTestContext();
+                SchemaContext schemaContext = TEST_SCHEMA_CONTEXT;
                 shardManager.tell(new UpdateSchemaContext(schemaContext), ActorRef.noSender());
 
                 shardManager.tell(new FindLocalShard("foo", true), getRef());
@@ -1404,10 +1418,10 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testOnCreateShardWithNoInitialSchemaContext ending");
     }
 
-    //@Test
-    public void testGetSnapshot() throws Exception {
+    @Test
+    public void testGetSnapshot() {
         LOG.info("testGetSnapshot starting");
-        JavaTestKit kit = new JavaTestKit(getSystem());
+        TestKit kit = new TestKit(getSystem());
 
         MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.<String, List<String>>builder()
                 .put("shard1", Arrays.asList("member-1")).put("shard2", Arrays.asList("member-1"))
@@ -1420,7 +1434,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         Failure failure = kit.expectMsgClass(Failure.class);
         assertEquals("Failure cause type", IllegalStateException.class, failure.cause().getClass());
 
-        shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), ActorRef.noSender());
+        shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), ActorRef.noSender());
 
         waitForShardInitialized(shardManager, "shard1", kit);
         waitForShardInitialized(shardManager, "shard2", kit);
@@ -1435,11 +1449,11 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         Function<ShardSnapshot, String> shardNameTransformer = ShardSnapshot::getName;
 
         assertEquals("Shard names", Sets.newHashSet("shard1", "shard2"), Sets.newHashSet(
-                Lists.transform(datastoreSnapshot.getShardSnapshots(), shardNameTransformer)));
+            datastoreSnapshot.getShardSnapshots().stream().map(shardNameTransformer).collect(Collectors.toSet())));
 
         // Add a new replica
 
-        JavaTestKit mockShardLeaderKit = new JavaTestKit(getSystem());
+        TestKit mockShardLeaderKit = new TestKit(getSystem());
 
         TestShardManager shardManagerInstance = shardManager.underlyingActor();
         shardManagerInstance.setMessageInterceptor(newFindPrimaryInterceptor(mockShardLeaderKit.getRef()));
@@ -1466,13 +1480,13 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testGetSnapshot ending");
     }
 
-    //@Test
-    public void testRestoreFromSnapshot() throws Exception {
+    @Test
+    public void testRestoreFromSnapshot() {
         LOG.info("testRestoreFromSnapshot starting");
 
         datastoreContextBuilder.shardInitializationTimeout(3, TimeUnit.SECONDS);
 
-        JavaTestKit kit = new JavaTestKit(getSystem());
+        TestKit kit = new TestKit(getSystem());
 
         MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.<String, List<String>>builder()
                 .put("shard1", Collections.<String>emptyList()).put("shard2", Collections.<String>emptyList())
@@ -1487,7 +1501,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
 
         shardManager.underlyingActor().waitForRecoveryComplete();
 
-        shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), ActorRef.noSender());
+        shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), ActorRef.noSender());
 
         waitForShardInitialized(shardManager, "shard1", kit);
         waitForShardInitialized(shardManager, "shard2", kit);
@@ -1506,9 +1520,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testRestoreFromSnapshot ending");
     }
 
-    //@Test
-    public void testAddShardReplicaForNonExistentShardConfig() throws Exception {
-        new JavaTestKit(getSystem()) {
+    @Test
+    public void testAddShardReplicaForNonExistentShardConfig() {
+        new TestKit(getSystem()) {
             {
                 ActorRef shardManager = actorFactory
                         .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider()))
@@ -1522,8 +1536,8 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         };
     }
 
-    //@Test
-    public void testAddShardReplica() throws Exception {
+    @Test
+    public void testAddShardReplica() {
         LOG.info("testAddShardReplica starting");
         MockConfiguration mockConfig = new MockConfiguration(
                 ImmutableMap.<String, List<String>>builder().put("default", Arrays.asList("member-1", "member-2"))
@@ -1559,10 +1573,10 @@ public class ShardManagerTest extends AbstractShardManagerTest {
                         .withDispatcher(Dispatchers.DefaultDispatcherId()),
                 shardManagerID);
 
-        new JavaTestKit(system1) {
+        new TestKit(system1) {
             {
-                newReplicaShardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
-                leaderShardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                newReplicaShardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
+                leaderShardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
 
                 leaderShardManager.tell(new ActorInitialized(), mockShardLeaderActor);
 
@@ -1609,15 +1623,15 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testAddShardReplica ending");
     }
 
-    //@Test
-    public void testAddShardReplicaWithPreExistingReplicaInRemoteShardLeader() throws Exception {
+    @Test
+    public void testAddShardReplicaWithPreExistingReplicaInRemoteShardLeader() {
         LOG.info("testAddShardReplicaWithPreExistingReplicaInRemoteShardLeader starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 TestActorRef<TestShardManager> shardManager = actorFactory
                         .createTestActor(newPropsShardMgrWithMockShardActor(), shardMgrID);
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager.tell(new ActorInitialized(), mockShardActor);
 
                 String leaderId = "leader-member-shard-default-" + shardMrgIDSuffix;
@@ -1671,15 +1685,15 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testAddShardReplicaWithPreExistingReplicaInRemoteShardLeader ending");
     }
 
-    //@Test
-    public void testAddShardReplicaWithPreExistingLocalReplicaLeader() throws Exception {
+    @Test
+    public void testAddShardReplicaWithPreExistingLocalReplicaLeader() {
         LOG.info("testAddShardReplicaWithPreExistingLocalReplicaLeader starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 String memberId = "member-1-shard-default-" + shardMrgIDSuffix;
                 ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager.tell(new ActorInitialized(), mockShardActor);
                 shardManager.tell(new ShardLeaderStateChanged(memberId, memberId, mock(DataTree.class),
                         DataStoreVersions.CURRENT_VERSION), getRef());
@@ -1699,15 +1713,15 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testAddShardReplicaWithPreExistingLocalReplicaLeader ending");
     }
 
-    //@Test
-    public void testAddShardReplicaWithAddServerReplyFailure() throws Exception {
+    @Test
+    public void testAddShardReplicaWithAddServerReplyFailure() {
         LOG.info("testAddShardReplicaWithAddServerReplyFailure starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
-                JavaTestKit mockShardLeaderKit = new JavaTestKit(getSystem());
+                TestKit mockShardLeaderKit = new TestKit(getSystem());
 
-                MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.<String, List<String>>builder()
-                        .put("astronauts", Arrays.asList("member-2")).build());
+                MockConfiguration mockConfig = new MockConfiguration(
+                    ImmutableMap.of("astronauts", Arrays.asList("member-2")));
 
                 ActorRef mockNewReplicaShardActor = newMockShardActor(getSystem(), "astronauts", "member-1");
                 final TestActorRef<TestShardManager> shardManager = actorFactory.createTestActor(
@@ -1716,9 +1730,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
                 shardManager.underlyingActor()
                         .setMessageInterceptor(newFindPrimaryInterceptor(mockShardLeaderKit.getRef()));
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
 
-                JavaTestKit terminateWatcher = new JavaTestKit(getSystem());
+                TestKit terminateWatcher = new TestKit(getSystem());
                 terminateWatcher.watch(mockNewReplicaShardActor);
 
                 shardManager.tell(new AddShardReplica("astronauts"), getRef());
@@ -1747,26 +1761,26 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testAddShardReplicaWithAddServerReplyFailure ending");
     }
 
-    //@Test
-    public void testAddShardReplicaWithAlreadyInProgress() throws Exception {
+    @Test
+    public void testAddShardReplicaWithAlreadyInProgress() {
         testServerChangeWhenAlreadyInProgress("astronauts", new AddShardReplica("astronauts"),
                 AddServer.class, new AddShardReplica("astronauts"));
     }
 
-    //@Test
-    public void testAddShardReplicaWithFindPrimaryTimeout() throws Exception {
+    @Test
+    public void testAddShardReplicaWithFindPrimaryTimeout() {
         LOG.info("testAddShardReplicaWithFindPrimaryTimeout starting");
         datastoreContextBuilder.shardInitializationTimeout(100, TimeUnit.MILLISECONDS);
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
-                MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.<String, List<String>>builder()
-                        .put("astronauts", Arrays.asList("member-2")).build());
+                MockConfiguration mockConfig = new MockConfiguration(
+                    ImmutableMap.of("astronauts", Arrays.asList("member-2")));
 
                 final ActorRef newReplicaShardManager = actorFactory
                         .createActor(newTestShardMgrBuilder(mockConfig).shardActor(mockShardActor).props()
                                 .withDispatcher(Dispatchers.DefaultDispatcherId()), shardMgrID);
 
-                newReplicaShardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                newReplicaShardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 MockClusterWrapper.sendMemberUp(newReplicaShardManager, "member-2",
                         AddressFromURIString.parse("akka://non-existent@127.0.0.1:5").toString());
 
@@ -1779,9 +1793,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testAddShardReplicaWithFindPrimaryTimeout ending");
     }
 
-    //@Test
-    public void testRemoveShardReplicaForNonExistentShard() throws Exception {
-        new JavaTestKit(getSystem()) {
+    @Test
+    public void testRemoveShardReplicaForNonExistentShard() {
+        new TestKit(getSystem()) {
             {
                 ActorRef shardManager = actorFactory
                         .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider()))
@@ -1794,12 +1808,12 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         };
     }
 
-    //@Test
+    @Test
     /**
      * Primary is Local.
      */
-    public void testRemoveShardReplicaLocal() throws Exception {
-        new JavaTestKit(getSystem()) {
+    public void testRemoveShardReplicaLocal() {
+        new TestKit(getSystem()) {
             {
                 String memberId = "member-1-shard-default-" + shardMrgIDSuffix;
 
@@ -1808,7 +1822,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
 
                 ActorRef shardManager = getSystem().actorOf(newPropsShardMgrWithMockShardActor(respondActor));
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager.tell(new ActorInitialized(), respondActor);
                 shardManager.tell(new ShardLeaderStateChanged(memberId, memberId, mock(DataTree.class),
                         DataStoreVersions.CURRENT_VERSION), getRef());
@@ -1826,8 +1840,8 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         };
     }
 
-    //@Test
-    public void testRemoveShardReplicaRemote() throws Exception {
+    @Test
+    public void testRemoveShardReplicaRemote() {
         MockConfiguration mockConfig = new MockConfiguration(
                 ImmutableMap.<String, List<String>>builder().put("default", Arrays.asList("member-1", "member-2"))
                         .put("astronauts", Arrays.asList("member-1")).build());
@@ -1879,10 +1893,10 @@ public class ShardManagerTest extends AbstractShardManagerTest {
 
         LOG.error("Forwarding actor : {}", actorRef);
 
-        new JavaTestKit(system1) {
+        new TestKit(system1) {
             {
-                newReplicaShardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
-                leaderShardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                newReplicaShardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
+                leaderShardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
 
                 leaderShardManager.tell(new ActorInitialized(), mockShardLeaderActor);
                 newReplicaShardManager.tell(new ActorInitialized(), mockShardLeaderActor);
@@ -1917,14 +1931,14 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         };
     }
 
-    //@Test
-    public void testRemoveShardReplicaWhenAnotherRemoveShardReplicaAlreadyInProgress() throws Exception {
+    @Test
+    public void testRemoveShardReplicaWhenAnotherRemoveShardReplicaAlreadyInProgress() {
         testServerChangeWhenAlreadyInProgress("astronauts", new RemoveShardReplica("astronauts", MEMBER_2),
                 RemoveServer.class, new RemoveShardReplica("astronauts", MEMBER_3));
     }
 
-    //@Test
-    public void testRemoveShardReplicaWhenAddShardReplicaAlreadyInProgress() throws Exception {
+    @Test
+    public void testRemoveShardReplicaWhenAddShardReplicaAlreadyInProgress() {
         testServerChangeWhenAlreadyInProgress("astronauts", new AddShardReplica("astronauts"),
                 AddServer.class, new RemoveShardReplica("astronauts", MEMBER_2));
     }
@@ -1932,11 +1946,11 @@ public class ShardManagerTest extends AbstractShardManagerTest {
 
     public void testServerChangeWhenAlreadyInProgress(final String shardName, final Object firstServerChange,
                                                       final Class<?> firstForwardedServerChangeClass,
-                                                      final Object secondServerChange) throws Exception {
-        new JavaTestKit(getSystem()) {
+                                                      final Object secondServerChange) {
+        new TestKit(getSystem()) {
             {
-                JavaTestKit mockShardLeaderKit = new JavaTestKit(getSystem());
-                final JavaTestKit secondRequestKit = new JavaTestKit(getSystem());
+                TestKit mockShardLeaderKit = new TestKit(getSystem());
+                final TestKit secondRequestKit = new TestKit(getSystem());
 
                 MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.<String, List<String>>builder()
                         .put(shardName, Arrays.asList("member-2")).build());
@@ -1950,7 +1964,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
                 shardManager.underlyingActor()
                         .setMessageInterceptor(newFindPrimaryInterceptor(mockShardLeaderKit.getRef()));
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
 
                 shardManager.tell(firstServerChange, getRef());
 
@@ -1963,10 +1977,10 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         };
     }
 
-    //@Test
-    public void testServerRemovedShardActorNotRunning() throws Exception {
+    @Test
+    public void testServerRemovedShardActorNotRunning() {
         LOG.info("testServerRemovedShardActorNotRunning starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.<String, List<String>>builder()
                         .put("default", Arrays.asList("member-1", "member-2"))
@@ -1996,10 +2010,10 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testServerRemovedShardActorNotRunning ending");
     }
 
-    //@Test
-    public void testServerRemovedShardActorRunning() throws Exception {
+    @Test
+    public void testServerRemovedShardActorRunning() {
         LOG.info("testServerRemovedShardActorRunning starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.<String, List<String>>builder()
                         .put("default", Arrays.asList("member-1", "member-2"))
@@ -2015,7 +2029,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
 
                 shardManager.underlyingActor().waitForRecoveryComplete();
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager.tell(new ActorInitialized(), shard);
 
                 waitForShardInitialized(shardManager, "people", this);
@@ -2033,10 +2047,10 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testServerRemovedShardActorRunning ending");
     }
 
-    //@Test
-    public void testShardPersistenceWithRestoredData() throws Exception {
+    @Test
+    public void testShardPersistenceWithRestoredData() {
         LOG.info("testShardPersistenceWithRestoredData starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 MockConfiguration mockConfig =
                     new MockConfiguration(ImmutableMap.<String, List<String>>builder()
@@ -2073,10 +2087,10 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testShardPersistenceWithRestoredData ending");
     }
 
-    //@Test
+    @Test
     public void testShutDown() throws Exception {
         LOG.info("testShutDown starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.<String, List<String>>builder()
                         .put("shard1", Arrays.asList("member-1")).put("shard2", Arrays.asList("member-1")).build());
@@ -2090,7 +2104,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
                 ActorRef shardManager = actorFactory.createActor(newTestShardMgrBuilder(mockConfig)
                         .addShardActor("shard1", shard1).addShardActor("shard2", shard2).props());
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager.tell(new ActorInitialized(), shard1);
                 shardManager.tell(new ActorInitialized(), shard2);
 
@@ -2118,9 +2132,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         LOG.info("testShutDown ending");
     }
 
-    //@Test
-    public void testChangeServersVotingStatus() throws Exception {
-        new JavaTestKit(getSystem()) {
+    @Test
+    public void testChangeServersVotingStatus() {
+        new TestKit(getSystem()) {
             {
                 String memberId = "member-1-shard-default-" + shardMrgIDSuffix;
 
@@ -2130,7 +2144,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
 
                 ActorRef shardManager = getSystem().actorOf(newPropsShardMgrWithMockShardActor(respondActor));
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager.tell(new ActorInitialized(), respondActor);
                 shardManager.tell(new ShardLeaderStateChanged(memberId, memberId, mock(DataTree.class),
                         DataStoreVersions.CURRENT_VERSION), getRef());
@@ -2154,9 +2168,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         };
     }
 
-    //@Test
-    public void testChangeServersVotingStatusWithNoLeader() throws Exception {
-        new JavaTestKit(getSystem()) {
+    @Test
+    public void testChangeServersVotingStatusWithNoLeader() {
+        new TestKit(getSystem()) {
             {
                 String memberId = "member-1-shard-default-" + shardMrgIDSuffix;
 
@@ -2166,7 +2180,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
 
                 ActorRef shardManager = getSystem().actorOf(newPropsShardMgrWithMockShardActor(respondActor));
 
-                shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+                shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef());
                 shardManager.tell(new ActorInitialized(), respondActor);
                 shardManager.tell(new RoleChangeNotification(memberId, null, RaftState.Follower.name()), respondActor);
 
OpenDaylight controller