Convert mdsal submit() calls to commit()
[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / datastore / DistributedDataStoreIntegrationTest.java
index 47cc35937f89a7a172ccfef1eb0c70d6b94ba1b5..482021aa8b78cfc01a2d503ec5c592730d9217a8 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2014, 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -16,12 +16,14 @@ import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
+
 import akka.actor.ActorSystem;
 import akka.actor.Address;
 import akka.actor.AddressFromURIString;
 import akka.cluster.Cluster;
-import akka.testkit.JavaTestKit;
+import akka.testkit.javadsl.TestKit;
 import com.google.common.base.Optional;
+import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -39,40 +41,45 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
 import org.mockito.Mockito;
+import org.opendaylight.controller.cluster.access.client.RequestTimeoutException;
+import org.opendaylight.controller.cluster.databroker.ClientBackedDataStore;
 import org.opendaylight.controller.cluster.databroker.ConcurrentDOMDataBroker;
 import org.opendaylight.controller.cluster.datastore.exceptions.NoShardLeaderException;
 import org.opendaylight.controller.cluster.datastore.exceptions.NotInitializedException;
-import org.opendaylight.controller.cluster.datastore.messages.DatastoreSnapshot;
 import org.opendaylight.controller.cluster.datastore.messages.FindLocalShard;
 import org.opendaylight.controller.cluster.datastore.messages.LocalShardFound;
+import org.opendaylight.controller.cluster.datastore.persisted.DatastoreSnapshot;
 import org.opendaylight.controller.cluster.datastore.persisted.MetadataShardDataTreeSnapshot;
-import org.opendaylight.controller.cluster.datastore.utils.MockDataChangeListener;
-import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry;
-import org.opendaylight.controller.cluster.raft.Snapshot;
+import org.opendaylight.controller.cluster.datastore.persisted.ShardSnapshotState;
+import org.opendaylight.controller.cluster.datastore.utils.MockDataTreeChangeListener;
+import org.opendaylight.controller.cluster.raft.persisted.Snapshot;
 import org.opendaylight.controller.cluster.raft.utils.InMemoryJournal;
+import org.opendaylight.controller.cluster.raft.utils.InMemorySnapshotStore;
 import org.opendaylight.controller.md.cluster.datastore.model.CarsModel;
 import org.opendaylight.controller.md.cluster.datastore.model.PeopleModel;
 import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper;
 import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionChainClosedException;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction;
-import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain;
-import org.opendaylight.controller.sal.core.spi.data.DOMStore;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreTransactionChain;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.common.api.ReadFailedException;
+import org.opendaylight.mdsal.common.api.TransactionChainClosedException;
+import org.opendaylight.mdsal.common.api.TransactionChainListener;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
+import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
+import org.opendaylight.mdsal.dom.spi.store.DOMStore;
+import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction;
+import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadWriteTransaction;
+import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort;
+import org.opendaylight.mdsal.dom.spi.store.DOMStoreTransactionChain;
+import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
@@ -80,28 +87,41 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder;
 import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory;
 
+@RunWith(Parameterized.class)
 public class DistributedDataStoreIntegrationTest {
 
-    private static ActorSystem system;
+    @Parameters(name = "{0}")
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][] {
+                { DistributedDataStore.class }, { ClientBackedDataStore.class }
+        });
+    }
+
+    @Parameter
+    public Class<? extends AbstractDataStore> testParameter;
+
+    private ActorSystem system;
 
-    private final DatastoreContext.Builder datastoreContextBuilder =
-            DatastoreContext.newBuilder().shardHeartbeatIntervalInMillis(100);
+    private final DatastoreContext.Builder datastoreContextBuilder = DatastoreContext.newBuilder()
+            .shardHeartbeatIntervalInMillis(100);
 
-    @BeforeClass
-    public static void setUpClass() throws IOException {
+    @Before
+    public void setUp() throws IOException {
+        InMemorySnapshotStore.clear();
+        InMemoryJournal.clear();
         system = ActorSystem.create("cluster-test", ConfigFactory.load().getConfig("Member1"));
-        Address member1Address = AddressFromURIString.parse("akka.tcp://cluster-test@127.0.0.1:2558");
+        Address member1Address = AddressFromURIString.parse("akka://cluster-test@127.0.0.1:2558");
         Cluster.get(system).join(member1Address);
     }
 
-    @AfterClass
-    public static void tearDownClass() throws IOException {
-        JavaTestKit.shutdownActorSystem(system);
+    @After
+    public void tearDown() throws IOException {
+        TestKit.shutdownActorSystem(system, Boolean.TRUE);
         system = null;
     }
 
@@ -110,289 +130,285 @@ public class DistributedDataStoreIntegrationTest {
     }
 
     @Test
-    public void testWriteTransactionWithSingleShard() throws Exception{
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            try (DistributedDataStore dataStore =
-                    setupDistributedDataStore("transactionIntegrationTest", "test-1")) {
+    public void testWriteTransactionWithSingleShard() throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, "transactionIntegrationTest", "test-1")) {
 
-                testWriteTransaction(dataStore, TestModel.TEST_PATH,
-                    ImmutableNodes.containerNode(TestModel.TEST_QNAME));
+                    testWriteTransaction(dataStore, TestModel.TEST_PATH,
+                            ImmutableNodes.containerNode(TestModel.TEST_QNAME));
 
-                testWriteTransaction(dataStore, TestModel.OUTER_LIST_PATH,
-                    ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build());
+                    testWriteTransaction(dataStore, TestModel.OUTER_LIST_PATH,
+                            ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build());
+                }
             }
-        }};
+        };
     }
 
     @Test
-    public void testWriteTransactionWithMultipleShards() throws Exception{
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            try (DistributedDataStore dataStore =
-                    setupDistributedDataStore("testWriteTransactionWithMultipleShards", "cars-1", "people-1")) {
-
-                DOMStoreWriteTransaction writeTx = dataStore.newWriteOnlyTransaction();
-                assertNotNull("newWriteOnlyTransaction returned null", writeTx);
+    public void testWriteTransactionWithMultipleShards() throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, "testWriteTransactionWithMultipleShards", "cars-1", "people-1")) {
 
-                writeTx.write(CarsModel.BASE_PATH, CarsModel.emptyContainer());
-                writeTx.write(PeopleModel.BASE_PATH, PeopleModel.emptyContainer());
+                    DOMStoreWriteTransaction writeTx = dataStore.newWriteOnlyTransaction();
+                    assertNotNull("newWriteOnlyTransaction returned null", writeTx);
 
-                doCommit(writeTx.ready());
+                    writeTx.write(CarsModel.BASE_PATH, CarsModel.emptyContainer());
+                    writeTx.write(PeopleModel.BASE_PATH, PeopleModel.emptyContainer());
 
-                writeTx = dataStore.newWriteOnlyTransaction();
+                    doCommit(writeTx.ready());
 
-                writeTx.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode());
-                writeTx.write(PeopleModel.PERSON_LIST_PATH, PeopleModel.newPersonMapNode());
+                    writeTx = dataStore.newWriteOnlyTransaction();
 
-                doCommit(writeTx.ready());
+                    writeTx.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode());
+                    writeTx.write(PeopleModel.PERSON_LIST_PATH, PeopleModel.newPersonMapNode());
 
-                writeTx = dataStore.newWriteOnlyTransaction();
+                    doCommit(writeTx.ready());
 
-                MapEntryNode car = CarsModel.newCarEntry("optima", BigInteger.valueOf(20000));
-                YangInstanceIdentifier carPath = CarsModel.newCarPath("optima");
-                writeTx.write(carPath, car);
+                    writeTx = dataStore.newWriteOnlyTransaction();
 
-                MapEntryNode person = PeopleModel.newPersonEntry("jack");
-                YangInstanceIdentifier personPath = PeopleModel.newPersonPath("jack");
-                writeTx.write(personPath, person);
+                    final MapEntryNode car = CarsModel.newCarEntry("optima", BigInteger.valueOf(20000));
+                    final YangInstanceIdentifier carPath = CarsModel.newCarPath("optima");
+                    writeTx.write(carPath, car);
 
-                doCommit(writeTx.ready());
+                    final MapEntryNode person = PeopleModel.newPersonEntry("jack");
+                    final YangInstanceIdentifier personPath = PeopleModel.newPersonPath("jack");
+                    writeTx.write(personPath, person);
 
-                // Verify the data in the store
+                    doCommit(writeTx.ready());
 
-                DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
+                    // Verify the data in the store
+                    final DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
 
-                Optional<NormalizedNode<?, ?>> optional = readTx.read(carPath).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", true, optional.isPresent());
-                assertEquals("Data node", car, optional.get());
+                    Optional<NormalizedNode<?, ?>> optional = readTx.read(carPath).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", true, optional.isPresent());
+                    assertEquals("Data node", car, optional.get());
 
-                optional = readTx.read(personPath).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", true, optional.isPresent());
-                assertEquals("Data node", person, optional.get());
+                    optional = readTx.read(personPath).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", true, optional.isPresent());
+                    assertEquals("Data node", person, optional.get());
+                }
             }
-        }};
+        };
     }
 
     @Test
-    public void testReadWriteTransactionWithSingleShard() throws Exception{
-        System.setProperty("shard.persistent", "true");
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            try (DistributedDataStore dataStore =
-                    setupDistributedDataStore("testReadWriteTransactionWithSingleShard", "test-1")) {
-
-                // 1. Create a read-write Tx
-
-                DOMStoreReadWriteTransaction readWriteTx = dataStore.newReadWriteTransaction();
-                assertNotNull("newReadWriteTransaction returned null", readWriteTx);
-
-                // 2. Write some data
-
-                YangInstanceIdentifier nodePath = TestModel.TEST_PATH;
-                NormalizedNode<?, ?> nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME);
-                readWriteTx.write(nodePath, nodeToWrite );
-
-                // 3. Read the data from Tx
-
-                Boolean exists = readWriteTx.exists(nodePath).checkedGet(5, TimeUnit.SECONDS);
-                assertEquals("exists", true, exists);
+    public void testReadWriteTransactionWithSingleShard() throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, "testReadWriteTransactionWithSingleShard", "test-1")) {
 
-                Optional<NormalizedNode<?, ?>> optional = readWriteTx.read(nodePath).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", true, optional.isPresent());
-                assertEquals("Data node", nodeToWrite, optional.get());
+                    // 1. Create a read-write Tx
+                    final DOMStoreReadWriteTransaction readWriteTx = dataStore.newReadWriteTransaction();
+                    assertNotNull("newReadWriteTransaction returned null", readWriteTx);
 
-                // 4. Ready the Tx for commit
+                    // 2. Write some data
+                    final YangInstanceIdentifier nodePath = TestModel.TEST_PATH;
+                    final NormalizedNode<?, ?> nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME);
+                    readWriteTx.write(nodePath, nodeToWrite);
 
-                DOMStoreThreePhaseCommitCohort cohort = readWriteTx.ready();
+                    // 3. Read the data from Tx
+                    final Boolean exists = readWriteTx.exists(nodePath).checkedGet(5, TimeUnit.SECONDS);
+                    assertEquals("exists", true, exists);
 
-                // 5. Commit the Tx
+                    Optional<NormalizedNode<?, ?>> optional = readWriteTx.read(nodePath).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", true, optional.isPresent());
+                    assertEquals("Data node", nodeToWrite, optional.get());
 
-                doCommit(cohort);
+                    // 4. Ready the Tx for commit
+                    final DOMStoreThreePhaseCommitCohort cohort = readWriteTx.ready();
 
-                // 6. Verify the data in the store
+                    // 5. Commit the Tx
+                    doCommit(cohort);
 
-                DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
+                    // 6. Verify the data in the store
+                    final DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
 
-                optional = readTx.read(nodePath).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", true, optional.isPresent());
-                assertEquals("Data node", nodeToWrite, optional.get());
+                    optional = readTx.read(nodePath).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", true, optional.isPresent());
+                    assertEquals("Data node", nodeToWrite, optional.get());
+                }
             }
-        }};
+        };
     }
 
     @Test
-    public void testReadWriteTransactionWithMultipleShards() throws Exception{
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            try (DistributedDataStore dataStore =
-                    setupDistributedDataStore("testReadWriteTransactionWithMultipleShards", "cars-1", "people-1")) {
-
-                DOMStoreReadWriteTransaction readWriteTx = dataStore.newReadWriteTransaction();
-                assertNotNull("newReadWriteTransaction returned null", readWriteTx);
+    public void testReadWriteTransactionWithMultipleShards() throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, "testReadWriteTransactionWithMultipleShards", "cars-1", "people-1")) {
 
-                readWriteTx.write(CarsModel.BASE_PATH, CarsModel.emptyContainer());
-                readWriteTx.write(PeopleModel.BASE_PATH, PeopleModel.emptyContainer());
+                    DOMStoreReadWriteTransaction readWriteTx = dataStore.newReadWriteTransaction();
+                    assertNotNull("newReadWriteTransaction returned null", readWriteTx);
 
-                doCommit(readWriteTx.ready());
+                    readWriteTx.write(CarsModel.BASE_PATH, CarsModel.emptyContainer());
+                    readWriteTx.write(PeopleModel.BASE_PATH, PeopleModel.emptyContainer());
 
-                readWriteTx = dataStore.newReadWriteTransaction();
+                    doCommit(readWriteTx.ready());
 
-                readWriteTx.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode());
-                readWriteTx.write(PeopleModel.PERSON_LIST_PATH, PeopleModel.newPersonMapNode());
+                    readWriteTx = dataStore.newReadWriteTransaction();
 
-                doCommit(readWriteTx.ready());
+                    readWriteTx.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode());
+                    readWriteTx.write(PeopleModel.PERSON_LIST_PATH, PeopleModel.newPersonMapNode());
 
-                readWriteTx = dataStore.newReadWriteTransaction();
+                    doCommit(readWriteTx.ready());
 
-                MapEntryNode car = CarsModel.newCarEntry("optima", BigInteger.valueOf(20000));
-                YangInstanceIdentifier carPath = CarsModel.newCarPath("optima");
-                readWriteTx.write(carPath, car);
+                    readWriteTx = dataStore.newReadWriteTransaction();
 
-                MapEntryNode person = PeopleModel.newPersonEntry("jack");
-                YangInstanceIdentifier personPath = PeopleModel.newPersonPath("jack");
-                readWriteTx.write(personPath, person);
+                    final MapEntryNode car = CarsModel.newCarEntry("optima", BigInteger.valueOf(20000));
+                    final YangInstanceIdentifier carPath = CarsModel.newCarPath("optima");
+                    readWriteTx.write(carPath, car);
 
-                Boolean exists = readWriteTx.exists(carPath).checkedGet(5, TimeUnit.SECONDS);
-                assertEquals("exists", true, exists);
+                    final MapEntryNode person = PeopleModel.newPersonEntry("jack");
+                    final YangInstanceIdentifier personPath = PeopleModel.newPersonPath("jack");
+                    readWriteTx.write(personPath, person);
 
-                Optional<NormalizedNode<?, ?>> optional = readWriteTx.read(carPath).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", true, optional.isPresent());
-                assertEquals("Data node", car, optional.get());
+                    final Boolean exists = readWriteTx.exists(carPath).checkedGet(5, TimeUnit.SECONDS);
+                    assertEquals("exists", true, exists);
 
-                doCommit(readWriteTx.ready());
+                    Optional<NormalizedNode<?, ?>> optional = readWriteTx.read(carPath).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", true, optional.isPresent());
+                    assertEquals("Data node", car, optional.get());
 
-                // Verify the data in the store
+                    doCommit(readWriteTx.ready());
 
-                DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
+                    // Verify the data in the store
+                    DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
 
-                optional = readTx.read(carPath).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", true, optional.isPresent());
-                assertEquals("Data node", car, optional.get());
+                    optional = readTx.read(carPath).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", true, optional.isPresent());
+                    assertEquals("Data node", car, optional.get());
 
-                optional = readTx.read(personPath).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", true, optional.isPresent());
-                assertEquals("Data node", person, optional.get());
+                    optional = readTx.read(personPath).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", true, optional.isPresent());
+                    assertEquals("Data node", person, optional.get());
 
+                }
             }
-        }};
+        };
     }
 
     @Test
-    public void testSingleTransactionsWritesInQuickSuccession() throws Exception{
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            try (DistributedDataStore dataStore = setupDistributedDataStore(
-                    "testSingleTransactionsWritesInQuickSuccession", "cars-1")) {
+    public void testSingleTransactionsWritesInQuickSuccession() throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, "testSingleTransactionsWritesInQuickSuccession", "cars-1")) {
 
-                DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
+                    final DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
 
-                DOMStoreWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
-                writeTx.write(CarsModel.BASE_PATH, CarsModel.emptyContainer());
-                writeTx.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode());
-                doCommit(writeTx.ready());
+                    DOMStoreWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
+                    writeTx.write(CarsModel.BASE_PATH, CarsModel.emptyContainer());
+                    writeTx.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode());
+                    doCommit(writeTx.ready());
 
-                writeTx = txChain.newWriteOnlyTransaction();
+                    writeTx = txChain.newWriteOnlyTransaction();
 
-                int nCars = 5;
-                for(int i = 0; i < nCars; i++) {
-                    writeTx.write(CarsModel.newCarPath("car" + i),
-                        CarsModel.newCarEntry("car" + i, BigInteger.valueOf(20000)));
-                }
+                    int numCars = 5;
+                    for (int i = 0; i < numCars; i++) {
+                        writeTx.write(CarsModel.newCarPath("car" + i),
+                                CarsModel.newCarEntry("car" + i, BigInteger.valueOf(20000)));
+                    }
 
-                doCommit(writeTx.ready());
+                    doCommit(writeTx.ready());
 
-                Optional<NormalizedNode<?, ?>> optional = txChain.newReadOnlyTransaction().read(
-                    CarsModel.CAR_LIST_PATH).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", true, optional.isPresent());
-                assertEquals("# cars", nCars, ((Collection<?>)optional.get().getValue()).size());
+                    final Optional<NormalizedNode<?, ?>> optional = txChain.newReadOnlyTransaction()
+                            .read(CarsModel.CAR_LIST_PATH).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", true, optional.isPresent());
+                    assertEquals("# cars", numCars, ((Collection<?>) optional.get().getValue()).size());
+                }
             }
-        }};
+        };
     }
 
-    private void testTransactionWritesWithShardNotInitiallyReady(final String testName,
-            final boolean writeOnly) throws Exception {
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            String shardName = "test-1";
-
-            // Setup the InMemoryJournal to block shard recovery to ensure the shard isn't
-            // initialized until we create and submit the write the Tx.
-            String persistentID = String.format("member-1-shard-%s-%s", shardName, testName);
-            CountDownLatch blockRecoveryLatch = new CountDownLatch(1);
-            InMemoryJournal.addBlockReadMessagesLatch(persistentID, blockRecoveryLatch);
-
-            try (DistributedDataStore dataStore = setupDistributedDataStore(testName, false, shardName)) {
-
-                // Create the write Tx
-
-                final DOMStoreWriteTransaction writeTx = writeOnly ? dataStore.newWriteOnlyTransaction() :
-                    dataStore.newReadWriteTransaction();
-                assertNotNull("newReadWriteTransaction returned null", writeTx);
-
-                // Do some modification operations and ready the Tx on a separate thread.
+    @SuppressWarnings("checkstyle:IllegalCatch")
+    private void testTransactionWritesWithShardNotInitiallyReady(final String testName, final boolean writeOnly)
+            throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                final String shardName = "test-1";
+
+                // Setup the InMemoryJournal to block shard recovery to ensure
+                // the shard isn't
+                // initialized until we create and submit the write the Tx.
+                final String persistentID = String.format("member-1-shard-%s-%s", shardName, testName);
+                final CountDownLatch blockRecoveryLatch = new CountDownLatch(1);
+                InMemoryJournal.addBlockReadMessagesLatch(persistentID, blockRecoveryLatch);
+
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, testName, false, shardName)) {
+
+                    // Create the write Tx
+                    final DOMStoreWriteTransaction writeTx = writeOnly ? dataStore.newWriteOnlyTransaction()
+                            : dataStore.newReadWriteTransaction();
+                    assertNotNull("newReadWriteTransaction returned null", writeTx);
 
-                final YangInstanceIdentifier listEntryPath = YangInstanceIdentifier.builder(
-                    TestModel.OUTER_LIST_PATH).nodeWithKey(TestModel.OUTER_LIST_QNAME,
-                        TestModel.ID_QNAME, 1).build();
+                    // Do some modification operations and ready the Tx on a
+                    // separate thread.
+                    final YangInstanceIdentifier listEntryPath = YangInstanceIdentifier
+                            .builder(TestModel.OUTER_LIST_PATH)
+                            .nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build();
 
-                final AtomicReference<DOMStoreThreePhaseCommitCohort> txCohort = new AtomicReference<>();
-                final AtomicReference<Exception> caughtEx = new AtomicReference<>();
-                final CountDownLatch txReady = new CountDownLatch(1);
-                Thread txThread = new Thread() {
-                    @Override
-                    public void run() {
+                    final AtomicReference<DOMStoreThreePhaseCommitCohort> txCohort = new AtomicReference<>();
+                    final AtomicReference<Exception> caughtEx = new AtomicReference<>();
+                    final CountDownLatch txReady = new CountDownLatch(1);
+                    final Thread txThread = new Thread(() -> {
                         try {
-                            writeTx.write(TestModel.TEST_PATH,
-                                ImmutableNodes.containerNode(TestModel.TEST_QNAME));
+                            writeTx.write(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
 
-                            writeTx.merge(TestModel.OUTER_LIST_PATH, ImmutableNodes.mapNodeBuilder(
-                                TestModel.OUTER_LIST_QNAME).build());
+                            writeTx.merge(TestModel.OUTER_LIST_PATH,
+                                    ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build());
 
-                            writeTx.write(listEntryPath, ImmutableNodes.mapEntry(
-                                TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1));
+                            writeTx.write(listEntryPath,
+                                    ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1));
 
                             writeTx.delete(listEntryPath);
 
                             txCohort.set(writeTx.ready());
-                        } catch(Exception e) {
+                        } catch (Exception e) {
                             caughtEx.set(e);
-                            return;
                         } finally {
                             txReady.countDown();
                         }
-                    }
-                };
+                    });
 
-                txThread.start();
-
-                // Wait for the Tx operations to complete.
-
-                boolean done = Uninterruptibles.awaitUninterruptibly(txReady, 5, TimeUnit.SECONDS);
-                if(caughtEx.get() != null) {
-                    throw caughtEx.get();
-                }
-
-                assertEquals("Tx ready", true, done);
-
-                // At this point the Tx operations should be waiting for the shard to initialize so
-                // trigger the latch to let the shard recovery to continue.
+                    txThread.start();
 
-                blockRecoveryLatch.countDown();
+                    // Wait for the Tx operations to complete.
+                    final boolean done = Uninterruptibles.awaitUninterruptibly(txReady, 5, TimeUnit.SECONDS);
+                    if (caughtEx.get() != null) {
+                        throw caughtEx.get();
+                    }
 
-                // Wait for the Tx commit to complete.
+                    assertEquals("Tx ready", true, done);
 
-                doCommit(txCohort.get());
+                    // At this point the Tx operations should be waiting for the
+                    // shard to initialize so
+                    // trigger the latch to let the shard recovery to continue.
+                    blockRecoveryLatch.countDown();
 
-                // Verify the data in the store
+                    // Wait for the Tx commit to complete.
+                    doCommit(txCohort.get());
 
-                DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
+                    // Verify the data in the store
+                    final DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
 
-                Optional<NormalizedNode<?, ?>> optional = readTx.read(TestModel.TEST_PATH).
-                        get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", true, optional.isPresent());
+                    Optional<NormalizedNode<?, ?>> optional = readTx.read(TestModel.TEST_PATH).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", true, optional.isPresent());
 
-                optional = readTx.read(TestModel.OUTER_LIST_PATH).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", true, optional.isPresent());
+                    optional = readTx.read(TestModel.OUTER_LIST_PATH).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", true, optional.isPresent());
 
-                optional = readTx.read(listEntryPath).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", false, optional.isPresent());
+                    optional = readTx.read(listEntryPath).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", false, optional.isPresent());
+                }
             }
-        }};
+        };
     }
 
     @Test
@@ -407,358 +423,372 @@ public class DistributedDataStoreIntegrationTest {
     }
 
     @Test
+    @SuppressWarnings("checkstyle:IllegalCatch")
     public void testTransactionReadsWithShardNotInitiallyReady() throws Exception {
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            String testName = "testTransactionReadsWithShardNotInitiallyReady";
-            String shardName = "test-1";
-
-            // Setup the InMemoryJournal to block shard recovery to ensure the shard isn't
-            // initialized until we create the Tx.
-            String persistentID = String.format("member-1-shard-%s-%s", shardName, testName);
-            CountDownLatch blockRecoveryLatch = new CountDownLatch(1);
-            InMemoryJournal.addBlockReadMessagesLatch(persistentID, blockRecoveryLatch);
-
-            try (DistributedDataStore dataStore = setupDistributedDataStore(testName, false, shardName)) {
-
-                // Create the read-write Tx
-
-                final DOMStoreReadWriteTransaction readWriteTx = dataStore.newReadWriteTransaction();
-                assertNotNull("newReadWriteTransaction returned null", readWriteTx);
-
-                // Do some reads on the Tx on a separate thread.
-
-                final AtomicReference<CheckedFuture<Boolean, ReadFailedException>> txExistsFuture =
-                        new AtomicReference<>();
-                final AtomicReference<CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException>>
-                txReadFuture = new AtomicReference<>();
-                final AtomicReference<Exception> caughtEx = new AtomicReference<>();
-                final CountDownLatch txReadsDone = new CountDownLatch(1);
-                Thread txThread = new Thread() {
-                    @Override
-                    public void run() {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                final String testName = "testTransactionReadsWithShardNotInitiallyReady";
+                final String shardName = "test-1";
+
+                // Setup the InMemoryJournal to block shard recovery to ensure
+                // the shard isn't
+                // initialized until we create the Tx.
+                final String persistentID = String.format("member-1-shard-%s-%s", shardName, testName);
+                final CountDownLatch blockRecoveryLatch = new CountDownLatch(1);
+                InMemoryJournal.addBlockReadMessagesLatch(persistentID, blockRecoveryLatch);
+
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, testName, false, shardName)) {
+
+                    // Create the read-write Tx
+                    final DOMStoreReadWriteTransaction readWriteTx = dataStore.newReadWriteTransaction();
+                    assertNotNull("newReadWriteTransaction returned null", readWriteTx);
+
+                    // Do some reads on the Tx on a separate thread.
+                    final AtomicReference<CheckedFuture<Boolean, ReadFailedException>> txExistsFuture =
+                            new AtomicReference<>();
+                    final AtomicReference<CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException>>
+                            txReadFuture = new AtomicReference<>();
+                    final AtomicReference<Exception> caughtEx = new AtomicReference<>();
+                    final CountDownLatch txReadsDone = new CountDownLatch(1);
+                    final Thread txThread = new Thread(() -> {
                         try {
                             readWriteTx.write(TestModel.TEST_PATH,
-                                ImmutableNodes.containerNode(TestModel.TEST_QNAME));
+                                    ImmutableNodes.containerNode(TestModel.TEST_QNAME));
 
                             txExistsFuture.set(readWriteTx.exists(TestModel.TEST_PATH));
 
                             txReadFuture.set(readWriteTx.read(TestModel.TEST_PATH));
-                        } catch(Exception e) {
+                        } catch (Exception e) {
                             caughtEx.set(e);
-                            return;
                         } finally {
                             txReadsDone.countDown();
                         }
-                    }
-                };
+                    });
 
-                txThread.start();
-
-                // Wait for the Tx operations to complete.
-
-                boolean done = Uninterruptibles.awaitUninterruptibly(txReadsDone, 5, TimeUnit.SECONDS);
-                if(caughtEx.get() != null) {
-                    throw caughtEx.get();
-                }
-
-                assertEquals("Tx reads done", true, done);
+                    txThread.start();
 
-                // At this point the Tx operations should be waiting for the shard to initialize so
-                // trigger the latch to let the shard recovery to continue.
+                    // Wait for the Tx operations to complete.
+                    boolean done = Uninterruptibles.awaitUninterruptibly(txReadsDone, 5, TimeUnit.SECONDS);
+                    if (caughtEx.get() != null) {
+                        throw caughtEx.get();
+                    }
 
-                blockRecoveryLatch.countDown();
+                    assertEquals("Tx reads done", true, done);
 
-                // Wait for the reads to complete and verify.
+                    // At this point the Tx operations should be waiting for the
+                    // shard to initialize so
+                    // trigger the latch to let the shard recovery to continue.
+                    blockRecoveryLatch.countDown();
 
-                assertEquals("exists", true, txExistsFuture.get().checkedGet(5, TimeUnit.SECONDS));
-                assertEquals("read", true, txReadFuture.get().checkedGet(5, TimeUnit.SECONDS).isPresent());
+                    // Wait for the reads to complete and verify.
+                    assertEquals("exists", true, txExistsFuture.get().checkedGet(5, TimeUnit.SECONDS));
+                    assertEquals("read", true, txReadFuture.get().checkedGet(5, TimeUnit.SECONDS).isPresent());
 
-                readWriteTx.close();
+                    readWriteTx.close();
+                }
             }
-        }};
+        };
     }
 
-    @Test(expected=NotInitializedException.class)
-    public void testTransactionCommitFailureWithShardNotInitialized() throws Throwable{
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            String testName = "testTransactionCommitFailureWithShardNotInitialized";
-            String shardName = "test-1";
+    @Test(expected = NotInitializedException.class)
+    @SuppressWarnings("checkstyle:IllegalCatch")
+    public void testTransactionCommitFailureWithShardNotInitialized() throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                final String testName = "testTransactionCommitFailureWithShardNotInitialized";
+                final String shardName = "test-1";
 
-            // Set the shard initialization timeout low for the test.
+                // Set the shard initialization timeout low for the test.
+                datastoreContextBuilder.shardInitializationTimeout(300, TimeUnit.MILLISECONDS);
 
-            datastoreContextBuilder.shardInitializationTimeout(300, TimeUnit.MILLISECONDS);
+                // Setup the InMemoryJournal to block shard recovery
+                // indefinitely.
+                final String persistentID = String.format("member-1-shard-%s-%s", shardName, testName);
+                final CountDownLatch blockRecoveryLatch = new CountDownLatch(1);
+                InMemoryJournal.addBlockReadMessagesLatch(persistentID, blockRecoveryLatch);
 
-            // Setup the InMemoryJournal to block shard recovery indefinitely.
+                InMemoryJournal.addEntry(persistentID, 1, "Dummy data so akka will read from persistence");
 
-            String persistentID = String.format("member-1-shard-%s-%s", shardName, testName);
-            CountDownLatch blockRecoveryLatch = new CountDownLatch(1);
-            InMemoryJournal.addBlockReadMessagesLatch(persistentID, blockRecoveryLatch);
-
-            InMemoryJournal.addEntry(persistentID, 1, "Dummy data so akka will read from persistence");
-
-            try (DistributedDataStore dataStore = setupDistributedDataStore(testName, false, shardName)) {
+                final AbstractDataStore dataStore =
+                        setupAbstractDataStore(testParameter, testName, false, shardName);
 
                 // Create the write Tx
-
                 final DOMStoreWriteTransaction writeTx = dataStore.newWriteOnlyTransaction();
                 assertNotNull("newReadWriteTransaction returned null", writeTx);
 
-                // Do some modifications and ready the Tx on a separate thread.
-
+                // Do some modifications and ready the Tx on a separate
+                // thread.
                 final AtomicReference<DOMStoreThreePhaseCommitCohort> txCohort = new AtomicReference<>();
                 final AtomicReference<Exception> caughtEx = new AtomicReference<>();
                 final CountDownLatch txReady = new CountDownLatch(1);
-                Thread txThread = new Thread() {
-                    @Override
-                    public void run() {
-                        try {
-                            writeTx.write(TestModel.TEST_PATH,
-                                ImmutableNodes.containerNode(TestModel.TEST_QNAME));
+                final Thread txThread = new Thread(() -> {
+                    try {
+                        writeTx.write(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
 
-                            txCohort.set(writeTx.ready());
-                        } catch(Exception e) {
-                            caughtEx.set(e);
-                            return;
-                        } finally {
-                            txReady.countDown();
-                        }
+                        txCohort.set(writeTx.ready());
+                    } catch (Exception e) {
+                        caughtEx.set(e);
+                    } finally {
+                        txReady.countDown();
                     }
-                };
+                });
 
                 txThread.start();
 
                 // Wait for the Tx operations to complete.
-
                 boolean done = Uninterruptibles.awaitUninterruptibly(txReady, 5, TimeUnit.SECONDS);
-                if(caughtEx.get() != null) {
+                if (caughtEx.get() != null) {
                     throw caughtEx.get();
                 }
 
                 assertEquals("Tx ready", true, done);
 
-                // Wait for the commit to complete. Since the shard never initialized, the Tx should
+                // Wait for the commit to complete. Since the shard never
+                // initialized, the Tx should
                 // have timed out and throw an appropriate exception cause.
-
                 try {
                     txCohort.get().canCommit().get(5, TimeUnit.SECONDS);
-                } catch(ExecutionException e) {
-                    throw e.getCause();
+                    fail("Expected NotInitializedException");
+                } catch (final Exception e) {
+                    final Throwable root = Throwables.getRootCause(e);
+                    Throwables.throwIfUnchecked(root);
+                    throw new RuntimeException(root);
                 } finally {
                     blockRecoveryLatch.countDown();
                 }
             }
-        }};
+        };
     }
 
-    @Test(expected=NotInitializedException.class)
-    public void testTransactionReadFailureWithShardNotInitialized() throws Throwable{
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            String testName = "testTransactionReadFailureWithShardNotInitialized";
-            String shardName = "test-1";
-
-            // Set the shard initialization timeout low for the test.
-
-            datastoreContextBuilder.shardInitializationTimeout(300, TimeUnit.MILLISECONDS);
+    @Test(expected = NotInitializedException.class)
+    @SuppressWarnings("checkstyle:IllegalCatch")
+    public void testTransactionReadFailureWithShardNotInitialized() throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                final String testName = "testTransactionReadFailureWithShardNotInitialized";
+                final String shardName = "test-1";
 
-            // Setup the InMemoryJournal to block shard recovery indefinitely.
+                // Set the shard initialization timeout low for the test.
+                datastoreContextBuilder.shardInitializationTimeout(300, TimeUnit.MILLISECONDS);
 
-            String persistentID = String.format("member-1-shard-%s-%s", shardName, testName);
-            CountDownLatch blockRecoveryLatch = new CountDownLatch(1);
-            InMemoryJournal.addBlockReadMessagesLatch(persistentID, blockRecoveryLatch);
+                // Setup the InMemoryJournal to block shard recovery
+                // indefinitely.
+                final String persistentID = String.format("member-1-shard-%s-%s", shardName, testName);
+                final CountDownLatch blockRecoveryLatch = new CountDownLatch(1);
+                InMemoryJournal.addBlockReadMessagesLatch(persistentID, blockRecoveryLatch);
 
-            InMemoryJournal.addEntry(persistentID, 1, "Dummy data so akka will read from persistence");
+                InMemoryJournal.addEntry(persistentID, 1, "Dummy data so akka will read from persistence");
 
-            try (DistributedDataStore dataStore = setupDistributedDataStore(testName, false, shardName)) {
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, testName, false, shardName)) {
 
-                // Create the read-write Tx
+                    // Create the read-write Tx
+                    final DOMStoreReadWriteTransaction readWriteTx = dataStore.newReadWriteTransaction();
+                    assertNotNull("newReadWriteTransaction returned null", readWriteTx);
 
-                final DOMStoreReadWriteTransaction readWriteTx = dataStore.newReadWriteTransaction();
-                assertNotNull("newReadWriteTransaction returned null", readWriteTx);
-
-                // Do a read on the Tx on a separate thread.
-
-                final AtomicReference<CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException>>
-                txReadFuture = new AtomicReference<>();
-                final AtomicReference<Exception> caughtEx = new AtomicReference<>();
-                final CountDownLatch txReadDone = new CountDownLatch(1);
-                Thread txThread = new Thread() {
-                    @Override
-                    public void run() {
+                    // Do a read on the Tx on a separate thread.
+                    final AtomicReference<CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException>>
+                            txReadFuture = new AtomicReference<>();
+                    final AtomicReference<Exception> caughtEx = new AtomicReference<>();
+                    final CountDownLatch txReadDone = new CountDownLatch(1);
+                    final Thread txThread = new Thread(() -> {
                         try {
                             readWriteTx.write(TestModel.TEST_PATH,
-                                ImmutableNodes.containerNode(TestModel.TEST_QNAME));
+                                    ImmutableNodes.containerNode(TestModel.TEST_QNAME));
 
                             txReadFuture.set(readWriteTx.read(TestModel.TEST_PATH));
 
                             readWriteTx.close();
-                        } catch(Exception e) {
+                        } catch (Exception e) {
                             caughtEx.set(e);
-                            return;
                         } finally {
                             txReadDone.countDown();
                         }
-                    }
-                };
+                    });
 
-                txThread.start();
-
-                // Wait for the Tx operations to complete.
+                    txThread.start();
 
-                boolean done = Uninterruptibles.awaitUninterruptibly(txReadDone, 5, TimeUnit.SECONDS);
-                if(caughtEx.get() != null) {
-                    throw caughtEx.get();
-                }
+                    // Wait for the Tx operations to complete.
+                    boolean done = Uninterruptibles.awaitUninterruptibly(txReadDone, 5, TimeUnit.SECONDS);
+                    if (caughtEx.get() != null) {
+                        throw caughtEx.get();
+                    }
 
-                assertEquals("Tx read done", true, done);
+                    assertEquals("Tx read done", true, done);
 
-                // Wait for the read to complete. Since the shard never initialized, the Tx should
-                // have timed out and throw an appropriate exception cause.
-
-                try {
-                    txReadFuture.get().checkedGet(5, TimeUnit.SECONDS);
-                } catch(ReadFailedException e) {
-                    throw e.getCause();
-                } finally {
-                    blockRecoveryLatch.countDown();
+                    // Wait for the read to complete. Since the shard never
+                    // initialized, the Tx should
+                    // have timed out and throw an appropriate exception cause.
+                    try {
+                        txReadFuture.get().checkedGet(5, TimeUnit.SECONDS);
+                        fail("Expected NotInitializedException");
+                    } catch (final ReadFailedException e) {
+                        final Throwable root = Throwables.getRootCause(e);
+                        Throwables.throwIfUnchecked(root);
+                        throw new RuntimeException(root);
+                    } finally {
+                        blockRecoveryLatch.countDown();
+                    }
                 }
             }
-        }};
+        };
     }
 
-    private void testTransactionCommitFailureWithNoShardLeader(final boolean writeOnly, final String testName) throws Throwable {
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            String shardName = "default";
+    @SuppressWarnings("checkstyle:IllegalCatch")
+    private void testTransactionCommitFailureWithNoShardLeader(final boolean writeOnly, final String testName)
+            throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                final String shardName = "default";
 
-            // We don't want the shard to become the leader so prevent shard elections.
-            datastoreContextBuilder.customRaftPolicyImplementation(
-                    "org.opendaylight.controller.cluster.raft.policy.DisableElectionsRaftPolicy");
+                // We don't want the shard to become the leader so prevent shard
+                // elections.
+                datastoreContextBuilder.customRaftPolicyImplementation(
+                        "org.opendaylight.controller.cluster.raft.policy.DisableElectionsRaftPolicy");
 
-            // The ShardManager uses the election timeout for FindPrimary so reset it low so it will timeout quickly.
-            datastoreContextBuilder.shardHeartbeatIntervalInMillis(100).shardElectionTimeoutFactor(1).
-                    shardInitializationTimeout(200, TimeUnit.MILLISECONDS);
+                // The ShardManager uses the election timeout for FindPrimary so
+                // reset it low so it will timeout quickly.
+                datastoreContextBuilder.shardHeartbeatIntervalInMillis(100).shardElectionTimeoutFactor(1)
+                        .shardInitializationTimeout(200, TimeUnit.MILLISECONDS).frontendRequestTimeoutInSeconds(2);
 
-            try (DistributedDataStore dataStore = setupDistributedDataStore(testName, false, shardName)) {
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, testName, false, shardName)) {
 
-                Object result = dataStore.getActorContext().executeOperation(
-                    dataStore.getActorContext().getShardManager(), new FindLocalShard(shardName, true));
-                assertTrue("Expected LocalShardFound. Actual: " + result, result instanceof LocalShardFound);
+                    final Object result = dataStore.getActorContext().executeOperation(
+                            dataStore.getActorContext().getShardManager(), new FindLocalShard(shardName, true));
+                    assertTrue("Expected LocalShardFound. Actual: " + result, result instanceof LocalShardFound);
 
-                // Create the write Tx.
-
-                try (final DOMStoreWriteTransaction writeTx = writeOnly ? dataStore.newWriteOnlyTransaction() :
-                    dataStore.newReadWriteTransaction()) {
-                    assertNotNull("newReadWriteTransaction returned null", writeTx);
-
-                    // Do some modifications and ready the Tx on a separate thread.
-
-                    final AtomicReference<DOMStoreThreePhaseCommitCohort> txCohort = new AtomicReference<>();
-                    final AtomicReference<Exception> caughtEx = new AtomicReference<>();
-                    final CountDownLatch txReady = new CountDownLatch(1);
-                    Thread txThread = new Thread() {
-                        @Override
-                        public void run() {
+                    // Create the write Tx.
+                    DOMStoreWriteTransaction writeTxToClose = null;
+                    try {
+                        writeTxToClose = writeOnly ? dataStore.newWriteOnlyTransaction()
+                                : dataStore.newReadWriteTransaction();
+                        final DOMStoreWriteTransaction writeTx = writeTxToClose;
+                        assertNotNull("newReadWriteTransaction returned null", writeTx);
+
+                        // Do some modifications and ready the Tx on a separate
+                        // thread.
+                        final AtomicReference<DOMStoreThreePhaseCommitCohort> txCohort = new AtomicReference<>();
+                        final AtomicReference<Exception> caughtEx = new AtomicReference<>();
+                        final CountDownLatch txReady = new CountDownLatch(1);
+                        final Thread txThread = new Thread(() -> {
                             try {
                                 writeTx.write(TestModel.JUNK_PATH,
-                                    ImmutableNodes.containerNode(TestModel.JUNK_QNAME));
+                                        ImmutableNodes.containerNode(TestModel.JUNK_QNAME));
 
                                 txCohort.set(writeTx.ready());
-                            } catch(Exception e) {
+                            } catch (Exception e) {
                                 caughtEx.set(e);
-                                return;
                             } finally {
                                 txReady.countDown();
                             }
-                        }
-                    };
+                        });
 
-                    txThread.start();
-
-                    // Wait for the Tx operations to complete.
+                        txThread.start();
 
-                    boolean done = Uninterruptibles.awaitUninterruptibly(txReady, 5, TimeUnit.SECONDS);
-                    if(caughtEx.get() != null) {
-                        throw caughtEx.get();
-                    }
-
-                    assertEquals("Tx ready", true, done);
+                        // Wait for the Tx operations to complete.
+                        boolean done = Uninterruptibles.awaitUninterruptibly(txReady, 5, TimeUnit.SECONDS);
+                        if (caughtEx.get() != null) {
+                            throw caughtEx.get();
+                        }
 
-                    // Wait for the commit to complete. Since no shard leader was elected in time, the Tx
-                    // should have timed out and throw an appropriate exception cause.
+                        assertEquals("Tx ready", true, done);
 
-                    try {
-                        txCohort.get().canCommit().get(5, TimeUnit.SECONDS);
-                    } catch(ExecutionException e) {
-                        throw e.getCause();
+                        // Wait for the commit to complete. Since no shard
+                        // leader was elected in time, the Tx
+                        // should have timed out and throw an appropriate
+                        // exception cause.
+                        try {
+                            txCohort.get().canCommit().get(10, TimeUnit.SECONDS);
+                            fail("Expected NoShardLeaderException");
+                        } catch (final ExecutionException e) {
+                            final String msg = "Unexpected exception: "
+                                    + Throwables.getStackTraceAsString(e.getCause());
+                            if (DistributedDataStore.class.equals(testParameter)) {
+                                assertTrue(Throwables.getRootCause(e) instanceof NoShardLeaderException);
+                            } else {
+                                assertTrue(msg, Throwables.getRootCause(e) instanceof RequestTimeoutException);
+                            }
+                        }
+                    } finally {
+                        try {
+                            if (writeTxToClose != null) {
+                                writeTxToClose.close();
+                            }
+                        } catch (Exception e) {
+                            // FIXME TransactionProxy.close throws IllegalStateException:
+                            // Transaction is ready, it cannot be closed
+                        }
                     }
                 }
             }
-        }};
+        };
     }
 
-    @Test(expected=NoShardLeaderException.class)
-    public void testWriteOnlyTransactionCommitFailureWithNoShardLeader() throws Throwable {
+    @Test
+    public void testWriteOnlyTransactionCommitFailureWithNoShardLeader() throws Exception {
         datastoreContextBuilder.writeOnlyTransactionOptimizationsEnabled(true);
         testTransactionCommitFailureWithNoShardLeader(true, "testWriteOnlyTransactionCommitFailureWithNoShardLeader");
     }
 
-    @Test(expected=NoShardLeaderException.class)
-    public void testReadWriteTransactionCommitFailureWithNoShardLeader() throws Throwable {
+    @Test
+    public void testReadWriteTransactionCommitFailureWithNoShardLeader() throws Exception {
         testTransactionCommitFailureWithNoShardLeader(false, "testReadWriteTransactionCommitFailureWithNoShardLeader");
     }
 
     @Test
-    public void testTransactionAbort() throws Exception{
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            try (DistributedDataStore dataStore =
-                    setupDistributedDataStore("transactionAbortIntegrationTest", "test-1")) {
+    public void testTransactionAbort() throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, "transactionAbortIntegrationTest", "test-1")) {
 
-                DOMStoreWriteTransaction writeTx = dataStore.newWriteOnlyTransaction();
-                assertNotNull("newWriteOnlyTransaction returned null", writeTx);
+                    final DOMStoreWriteTransaction writeTx = dataStore.newWriteOnlyTransaction();
+                    assertNotNull("newWriteOnlyTransaction returned null", writeTx);
 
-                writeTx.write(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
+                    writeTx.write(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
 
-                DOMStoreThreePhaseCommitCohort cohort = writeTx.ready();
+                    final DOMStoreThreePhaseCommitCohort cohort = writeTx.ready();
 
-                cohort.canCommit().get(5, TimeUnit.SECONDS);
+                    cohort.canCommit().get(5, TimeUnit.SECONDS);
 
-                cohort.abort().get(5, TimeUnit.SECONDS);
+                    cohort.abort().get(5, TimeUnit.SECONDS);
 
-                testWriteTransaction(dataStore, TestModel.TEST_PATH,
-                    ImmutableNodes.containerNode(TestModel.TEST_QNAME));
+                    testWriteTransaction(dataStore, TestModel.TEST_PATH,
+                            ImmutableNodes.containerNode(TestModel.TEST_QNAME));
+                }
             }
-        }};
+        };
     }
 
     @Test
-    public void testTransactionChainWithSingleShard() throws Exception{
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            try (DistributedDataStore dataStore =
-                    setupDistributedDataStore("testTransactionChainWithSingleShard", "test-1")) {
-
-                // 1. Create a Tx chain and write-only Tx
-
-                DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
-
-                DOMStoreWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
-                assertNotNull("newWriteOnlyTransaction returned null", writeTx);
-
-                // 2. Write some data
-
-                NormalizedNode<?, ?> testNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME);
-                writeTx.write(TestModel.TEST_PATH, testNode);
-
-                // 3. Ready the Tx for commit
-
-                final DOMStoreThreePhaseCommitCohort cohort1 = writeTx.ready();
-
-                // 4. Commit the Tx on another thread that first waits for the second read Tx.
-
-                final CountDownLatch continueCommit1 = new CountDownLatch(1);
-                final CountDownLatch commit1Done = new CountDownLatch(1);
-                final AtomicReference<Exception> commit1Error = new AtomicReference<>();
-                new Thread() {
-                    @Override
-                    public void run() {
+    @SuppressWarnings("checkstyle:IllegalCatch")
+    public void testTransactionChainWithSingleShard() throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, "testTransactionChainWithSingleShard", "test-1")) {
+
+                    // 1. Create a Tx chain and write-only Tx
+                    final DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
+
+                    final DOMStoreWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
+                    assertNotNull("newWriteOnlyTransaction returned null", writeTx);
+
+                    // 2. Write some data
+                    final NormalizedNode<?, ?> testNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME);
+                    writeTx.write(TestModel.TEST_PATH, testNode);
+
+                    // 3. Ready the Tx for commit
+                    final DOMStoreThreePhaseCommitCohort cohort1 = writeTx.ready();
+
+                    // 4. Commit the Tx on another thread that first waits for
+                    // the second read Tx.
+                    final CountDownLatch continueCommit1 = new CountDownLatch(1);
+                    final CountDownLatch commit1Done = new CountDownLatch(1);
+                    final AtomicReference<Exception> commit1Error = new AtomicReference<>();
+                    new Thread(() -> {
                         try {
                             continueCommit1.await();
                             doCommit(cohort1);
@@ -767,443 +797,475 @@ public class DistributedDataStoreIntegrationTest {
                         } finally {
                             commit1Done.countDown();
                         }
+                    }).start();
+
+                    // 5. Create a new read Tx from the chain to read and verify
+                    // the data from the first
+                    // Tx is visible after being readied.
+                    DOMStoreReadTransaction readTx = txChain.newReadOnlyTransaction();
+                    Optional<NormalizedNode<?, ?>> optional = readTx.read(TestModel.TEST_PATH).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", true, optional.isPresent());
+                    assertEquals("Data node", testNode, optional.get());
+
+                    // 6. Create a new RW Tx from the chain, write more data,
+                    // and ready it
+                    final DOMStoreReadWriteTransaction rwTx = txChain.newReadWriteTransaction();
+                    final MapNode outerNode = ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build();
+                    rwTx.write(TestModel.OUTER_LIST_PATH, outerNode);
+
+                    final DOMStoreThreePhaseCommitCohort cohort2 = rwTx.ready();
+
+                    // 7. Create a new read Tx from the chain to read the data
+                    // from the last RW Tx to
+                    // verify it is visible.
+                    readTx = txChain.newReadWriteTransaction();
+                    optional = readTx.read(TestModel.OUTER_LIST_PATH).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", true, optional.isPresent());
+                    assertEquals("Data node", outerNode, optional.get());
+
+                    // 8. Wait for the 2 commits to complete and close the
+                    // chain.
+                    continueCommit1.countDown();
+                    Uninterruptibles.awaitUninterruptibly(commit1Done, 5, TimeUnit.SECONDS);
+
+                    if (commit1Error.get() != null) {
+                        throw commit1Error.get();
                     }
-                }.start();
-
-                // 5. Create a new read Tx from the chain to read and verify the data from the first
-                // Tx is visible after being readied.
-
-                DOMStoreReadTransaction readTx = txChain.newReadOnlyTransaction();
-                Optional<NormalizedNode<?, ?>> optional = readTx.read(TestModel.TEST_PATH).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", true, optional.isPresent());
-                assertEquals("Data node", testNode, optional.get());
-
-                // 6. Create a new RW Tx from the chain, write more data, and ready it
-
-                DOMStoreReadWriteTransaction rwTx = txChain.newReadWriteTransaction();
-                MapNode outerNode = ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build();
-                rwTx.write(TestModel.OUTER_LIST_PATH, outerNode);
-
-                DOMStoreThreePhaseCommitCohort cohort2 = rwTx.ready();
-
-                // 7. Create a new read Tx from the chain to read the data from the last RW Tx to
-                // verify it is visible.
 
-                readTx = txChain.newReadWriteTransaction();
-                optional = readTx.read(TestModel.OUTER_LIST_PATH).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", true, optional.isPresent());
-                assertEquals("Data node", outerNode, optional.get());
+                    doCommit(cohort2);
 
-                // 8. Wait for the 2 commits to complete and close the chain.
+                    txChain.close();
 
-                continueCommit1.countDown();
-                Uninterruptibles.awaitUninterruptibly(commit1Done, 5, TimeUnit.SECONDS);
-
-                if(commit1Error.get() != null) {
-                    throw commit1Error.get();
+                    // 9. Create a new read Tx from the data store and verify
+                    // committed data.
+                    readTx = dataStore.newReadOnlyTransaction();
+                    optional = readTx.read(TestModel.OUTER_LIST_PATH).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", true, optional.isPresent());
+                    assertEquals("Data node", outerNode, optional.get());
                 }
-
-                doCommit(cohort2);
-
-                txChain.close();
-
-                // 9. Create a new read Tx from the data store and verify committed data.
-
-                readTx = dataStore.newReadOnlyTransaction();
-                optional = readTx.read(TestModel.OUTER_LIST_PATH).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", true, optional.isPresent());
-                assertEquals("Data node", outerNode, optional.get());
             }
-        }};
+        };
     }
 
     @Test
-    public void testTransactionChainWithMultipleShards() throws Exception{
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            try (DistributedDataStore dataStore = setupDistributedDataStore("testTransactionChainWithMultipleShards",
-                    "cars-1", "people-1")) {
+    public void testTransactionChainWithMultipleShards() throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, "testTransactionChainWithMultipleShards", "cars-1", "people-1")) {
 
-                DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
+                    final DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
 
-                DOMStoreWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
-                assertNotNull("newWriteOnlyTransaction returned null", writeTx);
+                    DOMStoreWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
+                    assertNotNull("newWriteOnlyTransaction returned null", writeTx);
 
-                writeTx.write(CarsModel.BASE_PATH, CarsModel.emptyContainer());
-                writeTx.write(PeopleModel.BASE_PATH, PeopleModel.emptyContainer());
+                    writeTx.write(CarsModel.BASE_PATH, CarsModel.emptyContainer());
+                    writeTx.write(PeopleModel.BASE_PATH, PeopleModel.emptyContainer());
 
-                writeTx.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode());
-                writeTx.write(PeopleModel.PERSON_LIST_PATH, PeopleModel.newPersonMapNode());
+                    writeTx.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode());
+                    writeTx.write(PeopleModel.PERSON_LIST_PATH, PeopleModel.newPersonMapNode());
 
-                DOMStoreThreePhaseCommitCohort cohort1 = writeTx.ready();
+                    final DOMStoreThreePhaseCommitCohort cohort1 = writeTx.ready();
 
-                DOMStoreReadWriteTransaction readWriteTx = txChain.newReadWriteTransaction();
+                    final DOMStoreReadWriteTransaction readWriteTx = txChain.newReadWriteTransaction();
 
-                MapEntryNode car = CarsModel.newCarEntry("optima", BigInteger.valueOf(20000));
-                YangInstanceIdentifier carPath = CarsModel.newCarPath("optima");
-                readWriteTx.write(carPath, car);
+                    final MapEntryNode car = CarsModel.newCarEntry("optima", BigInteger.valueOf(20000));
+                    final YangInstanceIdentifier carPath = CarsModel.newCarPath("optima");
+                    readWriteTx.write(carPath, car);
 
-                MapEntryNode person = PeopleModel.newPersonEntry("jack");
-                YangInstanceIdentifier personPath = PeopleModel.newPersonPath("jack");
-                readWriteTx.merge(personPath, person);
+                    final MapEntryNode person = PeopleModel.newPersonEntry("jack");
+                    final YangInstanceIdentifier personPath = PeopleModel.newPersonPath("jack");
+                    readWriteTx.merge(personPath, person);
 
-                Optional<NormalizedNode<?, ?>> optional = readWriteTx.read(carPath).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", true, optional.isPresent());
-                assertEquals("Data node", car, optional.get());
+                    Optional<NormalizedNode<?, ?>> optional = readWriteTx.read(carPath).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", true, optional.isPresent());
+                    assertEquals("Data node", car, optional.get());
 
-                optional = readWriteTx.read(personPath).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", true, optional.isPresent());
-                assertEquals("Data node", person, optional.get());
+                    optional = readWriteTx.read(personPath).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", true, optional.isPresent());
+                    assertEquals("Data node", person, optional.get());
 
-                DOMStoreThreePhaseCommitCohort cohort2 = readWriteTx.ready();
+                    final DOMStoreThreePhaseCommitCohort cohort2 = readWriteTx.ready();
 
-                writeTx = txChain.newWriteOnlyTransaction();
+                    writeTx = txChain.newWriteOnlyTransaction();
 
-                writeTx.delete(carPath);
+                    writeTx.delete(carPath);
 
-                DOMStoreThreePhaseCommitCohort cohort3 = writeTx.ready();
+                    final DOMStoreThreePhaseCommitCohort cohort3 = writeTx.ready();
 
-                ListenableFuture<Boolean> canCommit1 = cohort1.canCommit();
-                ListenableFuture<Boolean> canCommit2 = cohort2.canCommit();
+                    final ListenableFuture<Boolean> canCommit1 = cohort1.canCommit();
+                    final ListenableFuture<Boolean> canCommit2 = cohort2.canCommit();
 
-                doCommit(canCommit1, cohort1);
-                doCommit(canCommit2, cohort2);
-                doCommit(cohort3);
+                    doCommit(canCommit1, cohort1);
+                    doCommit(canCommit2, cohort2);
+                    doCommit(cohort3);
 
-                txChain.close();
+                    txChain.close();
 
-                DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
+                    final DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
 
-                optional = readTx.read(carPath).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", false, optional.isPresent());
+                    optional = readTx.read(carPath).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", false, optional.isPresent());
 
-                optional = readTx.read(personPath).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", true, optional.isPresent());
-                assertEquals("Data node", person, optional.get());
+                    optional = readTx.read(personPath).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", true, optional.isPresent());
+                    assertEquals("Data node", person, optional.get());
+                }
             }
-        }};
+        };
     }
 
     @Test
-    public void testCreateChainedTransactionsInQuickSuccession() throws Exception{
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            try (DistributedDataStore dataStore = setupDistributedDataStore(
-                    "testCreateChainedTransactionsInQuickSuccession", "cars-1")) {
+    public void testCreateChainedTransactionsInQuickSuccession() throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, "testCreateChainedTransactionsInQuickSuccession", "cars-1")) {
 
-                ConcurrentDOMDataBroker broker = new ConcurrentDOMDataBroker(
-                    ImmutableMap.<LogicalDatastoreType, DOMStore>builder().put(
-                        LogicalDatastoreType.CONFIGURATION, dataStore).build(), MoreExecutors.directExecutor());
+                    final ConcurrentDOMDataBroker broker = new ConcurrentDOMDataBroker(
+                            ImmutableMap.<LogicalDatastoreType, DOMStore>builder()
+                                    .put(LogicalDatastoreType.CONFIGURATION, dataStore).build(),
+                            MoreExecutors.directExecutor());
 
-                TransactionChainListener listener = Mockito.mock(TransactionChainListener.class);
-                DOMTransactionChain txChain = broker.createTransactionChain(listener);
+                    final TransactionChainListener listener = Mockito.mock(TransactionChainListener.class);
+                    DOMTransactionChain txChain = broker.createTransactionChain(listener);
 
-                List<CheckedFuture<Void, TransactionCommitFailedException>> futures = new ArrayList<>();
+                    final List<ListenableFuture<?>> futures = new ArrayList<>();
 
-                DOMDataWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
-                writeTx.put(LogicalDatastoreType.CONFIGURATION, CarsModel.BASE_PATH, CarsModel.emptyContainer());
-                writeTx.put(LogicalDatastoreType.CONFIGURATION, CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode());
-                futures.add(writeTx.submit());
+                    final DOMDataTreeWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
+                    writeTx.put(LogicalDatastoreType.CONFIGURATION, CarsModel.BASE_PATH, CarsModel.emptyContainer());
+                    writeTx.put(LogicalDatastoreType.CONFIGURATION, CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode());
+                    futures.add(writeTx.commit());
 
-                int nCars = 100;
-                for(int i = 0; i < nCars; i++) {
-                    DOMDataReadWriteTransaction rwTx = txChain.newReadWriteTransaction();
+                    int numCars = 100;
+                    for (int i = 0; i < numCars; i++) {
+                        final DOMDataTreeReadWriteTransaction rwTx = txChain.newReadWriteTransaction();
 
-                    rwTx.merge(LogicalDatastoreType.CONFIGURATION, CarsModel.newCarPath("car" + i),
-                        CarsModel.newCarEntry("car" + i, BigInteger.valueOf(20000)));
+                        rwTx.merge(LogicalDatastoreType.CONFIGURATION, CarsModel.newCarPath("car" + i),
+                                CarsModel.newCarEntry("car" + i, BigInteger.valueOf(20000)));
 
-                    futures.add(rwTx.submit());
-                }
+                        futures.add(rwTx.commit());
+                    }
 
-                for(CheckedFuture<Void, TransactionCommitFailedException> f: futures) {
-                    f.checkedGet();
-                }
+                    for (final ListenableFuture<?> f : futures) {
+                        f.get(5, TimeUnit.SECONDS);
+                    }
 
-                Optional<NormalizedNode<?, ?>> optional = txChain.newReadOnlyTransaction().read(
-                    LogicalDatastoreType.CONFIGURATION, CarsModel.CAR_LIST_PATH).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", true, optional.isPresent());
-                assertEquals("# cars", nCars, ((Collection<?>)optional.get().getValue()).size());
+                    final Optional<NormalizedNode<?, ?>> optional = txChain.newReadOnlyTransaction()
+                            .read(LogicalDatastoreType.CONFIGURATION, CarsModel.CAR_LIST_PATH).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", true, optional.isPresent());
+                    assertEquals("# cars", numCars, ((Collection<?>) optional.get().getValue()).size());
 
-                txChain.close();
+                    txChain.close();
 
-                broker.close();
+                    broker.close();
+                }
             }
-        }};
+        };
     }
 
     @Test
-    public void testCreateChainedTransactionAfterEmptyTxReadied() throws Exception{
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            try (DistributedDataStore dataStore = setupDistributedDataStore(
-                    "testCreateChainedTransactionAfterEmptyTxReadied", "test-1")) {
+    public void testCreateChainedTransactionAfterEmptyTxReadied() throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, "testCreateChainedTransactionAfterEmptyTxReadied", "test-1")) {
 
-                DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
+                    final DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
 
-                DOMStoreReadWriteTransaction rwTx1 = txChain.newReadWriteTransaction();
+                    final DOMStoreReadWriteTransaction rwTx1 = txChain.newReadWriteTransaction();
 
-                rwTx1.ready();
+                    rwTx1.ready();
 
-                DOMStoreReadWriteTransaction rwTx2 = txChain.newReadWriteTransaction();
+                    final DOMStoreReadWriteTransaction rwTx2 = txChain.newReadWriteTransaction();
 
-                Optional<NormalizedNode<?, ?>> optional = rwTx2.read(TestModel.TEST_PATH).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", false, optional.isPresent());
+                    final Optional<NormalizedNode<?, ?>> optional = rwTx2.read(TestModel.TEST_PATH).get(
+                            5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", false, optional.isPresent());
 
-                txChain.close();
+                    txChain.close();
+                }
             }
-        }};
+        };
     }
 
     @Test
-    public void testCreateChainedTransactionWhenPreviousNotReady() throws Throwable {
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            try (DistributedDataStore dataStore = setupDistributedDataStore(
-                "testCreateChainedTransactionWhenPreviousNotReady", "test-1")) {
+    public void testCreateChainedTransactionWhenPreviousNotReady() throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, "testCreateChainedTransactionWhenPreviousNotReady", "test-1")) {
 
-                final DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
+                    final DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
 
-                DOMStoreWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
-                assertNotNull("newWriteOnlyTransaction returned null", writeTx);
+                    final DOMStoreWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
+                    assertNotNull("newWriteOnlyTransaction returned null", writeTx);
 
-                writeTx.write(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
+                    writeTx.write(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
 
-                // Try to create another Tx of each type - each should fail b/c the previous Tx wasn't
-                // readied.
-
-                assertExceptionOnTxChainCreates(txChain, IllegalStateException.class);
+                    // Try to create another Tx of each type - each should fail
+                    // b/c the previous Tx wasn't
+                    // readied.
+                    assertExceptionOnTxChainCreates(txChain, IllegalStateException.class);
+                }
             }
-        }};
+        };
     }
 
     @Test
-    public void testCreateChainedTransactionAfterClose() throws Throwable {
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            try (DistributedDataStore dataStore = setupDistributedDataStore(
-                "testCreateChainedTransactionAfterClose", "test-1")) {
-
-                DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
-
-                txChain.close();
-
-                // Try to create another Tx of each type - should fail b/c the previous Tx was closed.
-
-                assertExceptionOnTxChainCreates(txChain, TransactionChainClosedException.class);
+    public void testCreateChainedTransactionAfterClose() throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, "testCreateChainedTransactionAfterClose", "test-1")) {
+
+                    final DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
+                    txChain.close();
+
+                    // Try to create another Tx of each type - should fail b/c
+                    // the previous Tx was closed.
+                    assertExceptionOnTxChainCreates(txChain, TransactionChainClosedException.class);
+                }
             }
-        }};
+        };
     }
 
     @Test
-    public void testChainWithReadOnlyTxAfterPreviousReady() throws Throwable {
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            try (DistributedDataStore dataStore = setupDistributedDataStore(
-                "testChainWithReadOnlyTxAfterPreviousReady", "test-1")) {
-
-                final DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
-
-                // Create a write tx and submit.
+    public void testChainWithReadOnlyTxAfterPreviousReady() throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, "testChainWithReadOnlyTxAfterPreviousReady", "test-1")) {
 
-                DOMStoreWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
-                writeTx.write(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
-                DOMStoreThreePhaseCommitCohort cohort1 = writeTx.ready();
+                    final DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
 
-                // Create read-only tx's and issue a read.
+                    // Create a write tx and submit.
+                    final DOMStoreWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
+                    writeTx.write(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
+                    final DOMStoreThreePhaseCommitCohort cohort1 = writeTx.ready();
 
-                CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> readFuture1 =
-                        txChain.newReadOnlyTransaction().read(TestModel.TEST_PATH);
+                    // Create read-only tx's and issue a read.
+                    CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> readFuture1 = txChain
+                            .newReadOnlyTransaction().read(TestModel.TEST_PATH);
 
-                CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> readFuture2 =
-                        txChain.newReadOnlyTransaction().read(TestModel.TEST_PATH);
+                    CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> readFuture2 = txChain
+                            .newReadOnlyTransaction().read(TestModel.TEST_PATH);
 
-                // Create another write tx and issue the write.
+                    // Create another write tx and issue the write.
+                    DOMStoreWriteTransaction writeTx2 = txChain.newWriteOnlyTransaction();
+                    writeTx2.write(TestModel.OUTER_LIST_PATH,
+                            ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build());
 
-                DOMStoreWriteTransaction writeTx2 = txChain.newWriteOnlyTransaction();
-                writeTx2.write(TestModel.OUTER_LIST_PATH,
-                    ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build());
+                    // Ensure the reads succeed.
 
-                // Ensure the reads succeed.
+                    assertEquals("isPresent", true, readFuture1.checkedGet(5, TimeUnit.SECONDS).isPresent());
+                    assertEquals("isPresent", true, readFuture2.checkedGet(5, TimeUnit.SECONDS).isPresent());
 
-                assertEquals("isPresent", true, readFuture1.checkedGet(5, TimeUnit.SECONDS).isPresent());
-                assertEquals("isPresent", true, readFuture2.checkedGet(5, TimeUnit.SECONDS).isPresent());
+                    // Ensure the writes succeed.
+                    DOMStoreThreePhaseCommitCohort cohort2 = writeTx2.ready();
 
-                // Ensure the writes succeed.
+                    doCommit(cohort1);
+                    doCommit(cohort2);
 
-                DOMStoreThreePhaseCommitCohort cohort2 = writeTx2.ready();
-
-                doCommit(cohort1);
-                doCommit(cohort2);
-
-                assertEquals("isPresent", true, txChain.newReadOnlyTransaction().read(TestModel.OUTER_LIST_PATH).
-                    checkedGet(5, TimeUnit.SECONDS).isPresent());
+                    assertEquals("isPresent", true, txChain.newReadOnlyTransaction().read(TestModel.OUTER_LIST_PATH)
+                            .checkedGet(5, TimeUnit.SECONDS).isPresent());
+                }
             }
-        }};
+        };
     }
 
     @Test
-    public void testChainedTransactionFailureWithSingleShard() throws Exception{
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            try (DistributedDataStore dataStore = setupDistributedDataStore(
-                    "testChainedTransactionFailureWithSingleShard", "cars-1")) {
+    public void testChainedTransactionFailureWithSingleShard() throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, "testChainedTransactionFailureWithSingleShard", "cars-1")) {
 
-                ConcurrentDOMDataBroker broker = new ConcurrentDOMDataBroker(
-                    ImmutableMap.<LogicalDatastoreType, DOMStore>builder().put(
-                        LogicalDatastoreType.CONFIGURATION, dataStore).build(), MoreExecutors.directExecutor());
+                    final ConcurrentDOMDataBroker broker = new ConcurrentDOMDataBroker(
+                            ImmutableMap.<LogicalDatastoreType, DOMStore>builder()
+                                    .put(LogicalDatastoreType.CONFIGURATION, dataStore).build(),
+                            MoreExecutors.directExecutor());
 
-                TransactionChainListener listener = Mockito.mock(TransactionChainListener.class);
-                DOMTransactionChain txChain = broker.createTransactionChain(listener);
+                    final TransactionChainListener listener = Mockito.mock(TransactionChainListener.class);
+                    final DOMTransactionChain txChain = broker.createTransactionChain(listener);
 
-                DOMDataReadWriteTransaction rwTx = txChain.newReadWriteTransaction();
+                    final DOMDataTreeReadWriteTransaction writeTx = txChain.newReadWriteTransaction();
 
-                ContainerNode invalidData = ImmutableContainerNodeBuilder.create().withNodeIdentifier(
-                    new YangInstanceIdentifier.NodeIdentifier(CarsModel.BASE_QNAME)).
-                        withChild(ImmutableNodes.leafNode(TestModel.JUNK_QNAME, "junk")).build();
+                    writeTx.put(LogicalDatastoreType.CONFIGURATION, PeopleModel.BASE_PATH,
+                            PeopleModel.emptyContainer());
 
-                rwTx.merge(LogicalDatastoreType.CONFIGURATION, CarsModel.BASE_PATH, invalidData);
+                    final ContainerNode invalidData = ImmutableContainerNodeBuilder.create()
+                            .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(CarsModel.BASE_QNAME))
+                            .withChild(ImmutableNodes.leafNode(TestModel.JUNK_QNAME, "junk")).build();
 
-                try {
-                    rwTx.submit().checkedGet(5, TimeUnit.SECONDS);
-                    fail("Expected TransactionCommitFailedException");
-                } catch (TransactionCommitFailedException e) {
-                    // Expected
-                }
+                    writeTx.merge(LogicalDatastoreType.CONFIGURATION, CarsModel.BASE_PATH, invalidData);
+
+                    try {
+                        writeTx.commit().get(5, TimeUnit.SECONDS);
+                        fail("Expected TransactionCommitFailedException");
+                    } catch (final ExecutionException e) {
+                        // Expected
+                    }
 
-                verify(listener, timeout(5000)).onTransactionChainFailed(eq(txChain), eq(rwTx), any(Throwable.class));
+                    verify(listener, timeout(5000)).onTransactionChainFailed(eq(txChain), eq(writeTx),
+                            any(Throwable.class));
 
-                txChain.close();
-                broker.close();
+                    txChain.close();
+                    broker.close();
+                }
             }
-        }};
+        };
     }
 
     @Test
-    public void testChainedTransactionFailureWithMultipleShards() throws Exception{
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            try (DistributedDataStore dataStore = setupDistributedDataStore(
-                    "testChainedTransactionFailureWithMultipleShards", "cars-1", "people-1")) {
+    public void testChainedTransactionFailureWithMultipleShards() throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, "testChainedTransactionFailureWithMultipleShards", "cars-1", "people-1")) {
 
-                ConcurrentDOMDataBroker broker = new ConcurrentDOMDataBroker(
-                    ImmutableMap.<LogicalDatastoreType, DOMStore>builder().put(
-                        LogicalDatastoreType.CONFIGURATION, dataStore).build(), MoreExecutors.directExecutor());
+                    final ConcurrentDOMDataBroker broker = new ConcurrentDOMDataBroker(
+                            ImmutableMap.<LogicalDatastoreType, DOMStore>builder()
+                                    .put(LogicalDatastoreType.CONFIGURATION, dataStore).build(),
+                            MoreExecutors.directExecutor());
 
-                TransactionChainListener listener = Mockito.mock(TransactionChainListener.class);
-                DOMTransactionChain txChain = broker.createTransactionChain(listener);
+                    final TransactionChainListener listener = Mockito.mock(TransactionChainListener.class);
+                    final DOMTransactionChain txChain = broker.createTransactionChain(listener);
 
-                DOMDataWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
+                    final DOMDataTreeWriteTransaction writeTx = txChain.newReadWriteTransaction();
 
-                writeTx.put(LogicalDatastoreType.CONFIGURATION, PeopleModel.BASE_PATH, PeopleModel.emptyContainer());
+                    writeTx.put(LogicalDatastoreType.CONFIGURATION, PeopleModel.BASE_PATH,
+                            PeopleModel.emptyContainer());
 
-                ContainerNode invalidData = ImmutableContainerNodeBuilder.create().withNodeIdentifier(
-                    new YangInstanceIdentifier.NodeIdentifier(CarsModel.BASE_QNAME)).
-                        withChild(ImmutableNodes.leafNode(TestModel.JUNK_QNAME, "junk")).build();
+                    final ContainerNode invalidData = ImmutableContainerNodeBuilder.create()
+                            .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(CarsModel.BASE_QNAME))
+                            .withChild(ImmutableNodes.leafNode(TestModel.JUNK_QNAME, "junk")).build();
 
-                // Note that merge will validate the data and fail but put succeeds b/c deep validation is not
-                // done for put for performance reasons.
-                writeTx.merge(LogicalDatastoreType.CONFIGURATION, CarsModel.BASE_PATH, invalidData);
+                    writeTx.merge(LogicalDatastoreType.CONFIGURATION, CarsModel.BASE_PATH, invalidData);
 
-                try {
-                    writeTx.submit().checkedGet(5, TimeUnit.SECONDS);
-                    fail("Expected TransactionCommitFailedException");
-                } catch (TransactionCommitFailedException e) {
-                    // Expected
-                }
+                    // Note that merge will validate the data and fail but put
+                    // succeeds b/c deep validation is not
+                    // done for put for performance reasons.
+                    try {
+                        writeTx.commit().get(5, TimeUnit.SECONDS);
+                        fail("Expected TransactionCommitFailedException");
+                    } catch (final ExecutionException e) {
+                        // Expected
+                    }
 
-                verify(listener, timeout(5000)).onTransactionChainFailed(eq(txChain), eq(writeTx), any(Throwable.class));
+                    verify(listener, timeout(5000)).onTransactionChainFailed(eq(txChain), eq(writeTx),
+                            any(Throwable.class));
 
-                txChain.close();
-                broker.close();
+                    txChain.close();
+                    broker.close();
+                }
             }
-        }};
+        };
     }
 
     @Test
-    public void testChangeListenerRegistration() throws Exception{
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            try (DistributedDataStore dataStore =
-                    setupDistributedDataStore("testChangeListenerRegistration", "test-1")) {
-
-                testWriteTransaction(dataStore, TestModel.TEST_PATH,
-                    ImmutableNodes.containerNode(TestModel.TEST_QNAME));
+    public void testDataTreeChangeListenerRegistration() throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, "testDataTreeChangeListenerRegistration", "test-1")) {
 
-                MockDataChangeListener listener = new MockDataChangeListener(1);
+                    testWriteTransaction(dataStore, TestModel.TEST_PATH,
+                            ImmutableNodes.containerNode(TestModel.TEST_QNAME));
 
-                ListenerRegistration<MockDataChangeListener>
-                listenerReg = dataStore.registerChangeListener(TestModel.TEST_PATH, listener,
-                    DataChangeScope.SUBTREE);
+                    final MockDataTreeChangeListener listener = new MockDataTreeChangeListener(1);
 
-                assertNotNull("registerChangeListener returned null", listenerReg);
+                    ListenerRegistration<MockDataTreeChangeListener> listenerReg = dataStore
+                            .registerTreeChangeListener(TestModel.TEST_PATH, listener);
 
-                // Wait for the initial notification
+                    assertNotNull("registerTreeChangeListener returned null", listenerReg);
 
-                listener.waitForChangeEvents(TestModel.TEST_PATH);
+                    IntegrationTestKit.verifyShardState(dataStore, "test-1",
+                        state -> assertEquals("getTreeChangeListenerActors", 1,
+                                state.getTreeChangeListenerActors().size()));
 
-                listener.reset(2);
+                    // Wait for the initial notification
+                    listener.waitForChangeEvents(TestModel.TEST_PATH);
+                    listener.reset(2);
 
-                // Write 2 updates.
+                    // Write 2 updates.
+                    testWriteTransaction(dataStore, TestModel.OUTER_LIST_PATH,
+                            ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build());
 
-                testWriteTransaction(dataStore, TestModel.OUTER_LIST_PATH,
-                    ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build());
+                    YangInstanceIdentifier listPath = YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH)
+                            .nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build();
+                    testWriteTransaction(dataStore, listPath,
+                            ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1));
 
-                YangInstanceIdentifier listPath = YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH).
-                        nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build();
-                testWriteTransaction(dataStore, listPath,
-                    ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1));
+                    // Wait for the 2 updates.
+                    listener.waitForChangeEvents(TestModel.OUTER_LIST_PATH, listPath);
+                    listenerReg.close();
 
-                // Wait for the 2 updates.
+                    IntegrationTestKit.verifyShardState(dataStore, "test-1",
+                        state -> assertEquals("getTreeChangeListenerActors", 0,
+                                state.getTreeChangeListenerActors().size()));
 
-                listener.waitForChangeEvents(TestModel.OUTER_LIST_PATH, listPath);
+                    testWriteTransaction(dataStore,
+                            YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH)
+                                    .nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 2).build(),
+                            ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 2));
 
-                listenerReg.close();
-
-                testWriteTransaction(dataStore, YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH).
-                    nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 2).build(),
-                    ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 2));
-
-                listener.expectNoMoreChanges("Received unexpected change after close");
+                    listener.expectNoMoreChanges("Received unexpected change after close");
+                }
             }
-        }};
+        };
     }
 
     @Test
     public void testRestoreFromDatastoreSnapshot() throws Exception {
-        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
-            String name = "transactionIntegrationTest";
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {
+            {
+                final String name = "transactionIntegrationTest";
 
-            ContainerNode carsNode = CarsModel.newCarsNode(CarsModel.newCarsMapNode(
-                    CarsModel.newCarEntry("optima", BigInteger.valueOf(20000L)),
-                    CarsModel.newCarEntry("sportage", BigInteger.valueOf(30000L))));
+                final ContainerNode carsNode = CarsModel.newCarsNode(
+                        CarsModel.newCarsMapNode(CarsModel.newCarEntry("optima", BigInteger.valueOf(20000L)),
+                                CarsModel.newCarEntry("sportage", BigInteger.valueOf(30000L))));
 
-            DataTree dataTree = InMemoryDataTreeFactory.getInstance().create(TreeType.OPERATIONAL);
-            dataTree.setSchemaContext(SchemaContextHelper.full());
-            AbstractShardTest.writeToStore(dataTree, CarsModel.BASE_PATH, carsNode);
-            NormalizedNode<?, ?> root = AbstractShardTest.readStore(dataTree, YangInstanceIdentifier.EMPTY);
+                DataTree dataTree = new InMemoryDataTreeFactory().create(
+                    DataTreeConfiguration.DEFAULT_OPERATIONAL, SchemaContextHelper.full());
+                AbstractShardTest.writeToStore(dataTree, CarsModel.BASE_PATH, carsNode);
+                NormalizedNode<?, ?> root = AbstractShardTest.readStore(dataTree, YangInstanceIdentifier.EMPTY);
 
-            Snapshot carsSnapshot = Snapshot.create(new MetadataShardDataTreeSnapshot(root).serialize(),
-                    Collections.<ReplicatedLogEntry>emptyList(), 2, 1, 2, 1, 1, "member-1");
+                final Snapshot carsSnapshot = Snapshot.create(
+                        new ShardSnapshotState(new MetadataShardDataTreeSnapshot(root)),
+                        Collections.emptyList(), 2, 1, 2, 1, 1, "member-1", null);
 
-            NormalizedNode<?, ?> peopleNode = PeopleModel.create();
-            dataTree = InMemoryDataTreeFactory.getInstance().create(TreeType.OPERATIONAL);
-            dataTree.setSchemaContext(SchemaContextHelper.full());
-            AbstractShardTest.writeToStore(dataTree, PeopleModel.BASE_PATH, peopleNode);
-            root = AbstractShardTest.readStore(dataTree, YangInstanceIdentifier.EMPTY);
+                dataTree = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_OPERATIONAL,
+                    SchemaContextHelper.full());
 
-            Snapshot peopleSnapshot = Snapshot.create(new MetadataShardDataTreeSnapshot(root).serialize(),
-                    Collections.<ReplicatedLogEntry>emptyList(), 2, 1, 2, 1, 1, "member-1");
+                final NormalizedNode<?, ?> peopleNode = PeopleModel.create();
+                AbstractShardTest.writeToStore(dataTree, PeopleModel.BASE_PATH, peopleNode);
 
-            restoreFromSnapshot = new DatastoreSnapshot(name, null, Arrays.asList(
-                    new DatastoreSnapshot.ShardSnapshot("cars",
-                            org.apache.commons.lang3.SerializationUtils.serialize(carsSnapshot)),
-                    new DatastoreSnapshot.ShardSnapshot("people",
-                            org.apache.commons.lang3.SerializationUtils.serialize(peopleSnapshot))));
+                root = AbstractShardTest.readStore(dataTree, YangInstanceIdentifier.EMPTY);
 
-            try (DistributedDataStore dataStore = setupDistributedDataStore(name, "module-shards-member1.conf",
-                    true, "cars", "people")) {
+                final Snapshot peopleSnapshot = Snapshot.create(
+                        new ShardSnapshotState(new MetadataShardDataTreeSnapshot(root)),
+                        Collections.emptyList(), 2, 1, 2, 1, 1, "member-1", null);
 
-                DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
+                restoreFromSnapshot = new DatastoreSnapshot(name, null, Arrays.asList(
+                        new DatastoreSnapshot.ShardSnapshot("cars", carsSnapshot),
+                        new DatastoreSnapshot.ShardSnapshot("people", peopleSnapshot)));
 
-                Optional<NormalizedNode<?, ?>> optional = readTx.read(CarsModel.BASE_PATH).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", true, optional.isPresent());
-                assertEquals("Data node", carsNode, optional.get());
+                try (AbstractDataStore dataStore = setupAbstractDataStore(
+                        testParameter, name, "module-shards-member1.conf", true, "cars", "people")) {
 
-                optional = readTx.read(PeopleModel.BASE_PATH).get(5, TimeUnit.SECONDS);
-                assertEquals("isPresent", true, optional.isPresent());
-                assertEquals("Data node", peopleNode, optional.get());
+                    final DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
+
+                    // two reads
+                    Optional<NormalizedNode<?, ?>> optional = readTx.read(CarsModel.BASE_PATH).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", true, optional.isPresent());
+                    assertEquals("Data node", carsNode, optional.get());
+
+                    optional = readTx.read(PeopleModel.BASE_PATH).get(5, TimeUnit.SECONDS);
+                    assertEquals("isPresent", true, optional.isPresent());
+                    assertEquals("Data node", peopleNode, optional.get());
+                }
             }
-        }};
+        };
     }
 }