diff --git a/datapool/PoolDataSetIF.h b/datapool/PoolDataSetIF.h
index 9151f2f8..f905cc4d 100644
--- a/datapool/PoolDataSetIF.h
+++ b/datapool/PoolDataSetIF.h
@@ -9,8 +9,8 @@
  *          and unlock a data pool and read/commit semantics.
  */
 class PoolDataSetIF:
-        public DataSetIF,
-        public ReadCommitIF {
+        virtual public DataSetIF,
+        virtual public ReadCommitIF {
 public:
     virtual~ PoolDataSetIF() {};
 
diff --git a/datapool/SharedDataSetIF.h b/datapool/SharedDataSetIF.h
index da21f9cf..4d23f87f 100644
--- a/datapool/SharedDataSetIF.h
+++ b/datapool/SharedDataSetIF.h
@@ -3,8 +3,7 @@
 
 #include "PoolDataSetIF.h"
 
-class SharedDataSetIF:
-        public PoolDataSetIF {
+class SharedDataSetIF {
 public:
     virtual ~SharedDataSetIF() {};
 
diff --git a/unittest/tests/datapoollocal/DataSetTest.cpp b/unittest/tests/datapoollocal/DataSetTest.cpp
index ecc1921f..06964d26 100644
--- a/unittest/tests/datapoollocal/DataSetTest.cpp
+++ b/unittest/tests/datapoollocal/DataSetTest.cpp
@@ -254,12 +254,12 @@ TEST_CASE("DataSetTest" , "[DataSetTest]") {
     }
 
     SECTION("SharedDataSet") {
-//        object_id_t sharedSetId = objects::SHARED_SET_ID;
-//        SharedLocalDataSet sharedSet(sharedSetId, poolOwner, 2, 5);
-//        CHECK(sharedSet.initialize() == retval::CATCH_OK);
-//        CHECK(sharedSet.lockDataset() == retval::CATCH_OK);
-//
-//        CHECK(sharedSet.unlockDataset() == retval::CATCH_OK);
+        object_id_t sharedSetId = objects::SHARED_SET_ID;
+        SharedLocalDataSet sharedSet(sharedSetId, poolOwner, 2, 5);
+        CHECK(sharedSet.initialize() == retval::CATCH_OK);
+        CHECK(sharedSet.lockDataset() == retval::CATCH_OK);
+
+        CHECK(sharedSet.unlockDataset() == retval::CATCH_OK);
     }
 
     /* we need to reset the subscription list because the pool owner
diff --git a/unittest/tests/datapoollocal/LocalPoolOwnerBase.h b/unittest/tests/datapoollocal/LocalPoolOwnerBase.h
index 9a7639f8..f08b9eb9 100644
--- a/unittest/tests/datapoollocal/LocalPoolOwnerBase.h
+++ b/unittest/tests/datapoollocal/LocalPoolOwnerBase.h
@@ -36,7 +36,8 @@ static const gp_id_t uint64Vec2Id = gp_id_t(objects::TEST_LOCAL_POOL_OWNER_BASE,
 class LocalPoolStaticTestDataSet: public StaticLocalDataSet<3> {
 public:
     LocalPoolStaticTestDataSet():
-            StaticLocalDataSet(lpool::testSid) {
+        StaticLocalDataSet(lpool::testSid) {
+
     }
 
     LocalPoolStaticTestDataSet(HasLocalDataPoolIF* owner, uint32_t setId):
@@ -53,7 +54,12 @@ private:
 class LocalPoolTestDataSet: public LocalDataSet {
 public:
     LocalPoolTestDataSet():
-        LocalDataSet(lpool::testSid, lpool::dataSetMaxVariables) {
+        LocalDataSet(lpool::testSid, lpool::dataSetMaxVariables),
+        localPoolVarUint8(lpool::uint8VarGpid, this),
+        localPoolVarFloat(lpool::floatVarGpid, this),
+        localPoolUint16Vec(lpool::uint16Vec3Gpid, this)
+
+    {
     }
 
     LocalPoolTestDataSet(HasLocalDataPoolIF* owner, uint32_t setId):