diff --git a/datapool/PoolDataSetBase.cpp b/datapool/PoolDataSetBase.cpp
index bdca22c3d..73ec4bd70 100644
--- a/datapool/PoolDataSetBase.cpp
+++ b/datapool/PoolDataSetBase.cpp
@@ -8,8 +8,7 @@
 PoolDataSetBase::PoolDataSetBase(PoolVariableIF** registeredVariablesArray,
         const size_t maxFillCount):
         registeredVariables(registeredVariablesArray),
-        maxFillCount(maxFillCount) {
-}
+        maxFillCount(maxFillCount) {}
 
 PoolDataSetBase::~PoolDataSetBase() {}
 
diff --git a/datapool/SharedDataSetIF.h b/datapool/SharedDataSetIF.h
index b8d98794d..da21f9cfc 100644
--- a/datapool/SharedDataSetIF.h
+++ b/datapool/SharedDataSetIF.h
@@ -1,13 +1,16 @@
 #ifndef FRAMEWORK_DATAPOOL_SHAREDDATASETIF_H_
 #define FRAMEWORK_DATAPOOL_SHAREDDATASETIF_H_
+
 #include "PoolDataSetIF.h"
 
-class SharedDataSetIF: public PoolDataSetIF {
+class SharedDataSetIF:
+        public PoolDataSetIF {
 public:
     virtual ~SharedDataSetIF() {};
 
 private:
-    virtual ReturnValue_t lockDataset(dur_millis_t mutexTimeout) = 0;
+    virtual ReturnValue_t lockDataset(MutexIF::TimeoutType timeoutType,
+            dur_millis_t mutexTimeout) = 0;
     virtual ReturnValue_t unlockDataset() = 0;
 };
 
diff --git a/datapoollocal/LocalPoolDataSetBase.cpp b/datapoollocal/LocalPoolDataSetBase.cpp
index 3abbf0dd2..d93b926d2 100644
--- a/datapoollocal/LocalPoolDataSetBase.cpp
+++ b/datapoollocal/LocalPoolDataSetBase.cpp
@@ -44,7 +44,7 @@ LocalPoolDataSetBase::LocalPoolDataSetBase(HasLocalDataPoolIF *hkOwner,
 
 LocalPoolDataSetBase::LocalPoolDataSetBase(sid_t sid, PoolVariableIF** registeredVariablesArray,
         const size_t maxNumberOfVariables):
-                PoolDataSetBase(registeredVariablesArray, maxNumberOfVariables)  {
+        PoolDataSetBase(registeredVariablesArray, maxNumberOfVariables)  {
     HasLocalDataPoolIF* hkOwner = objectManager->get<HasLocalDataPoolIF>(
             sid.objectId);
     if(hkOwner != nullptr) {
diff --git a/datapoollocal/SharedLocalDataSet.cpp b/datapoollocal/SharedLocalDataSet.cpp
index 9915628ea..abcf7da96 100644
--- a/datapoollocal/SharedLocalDataSet.cpp
+++ b/datapoollocal/SharedLocalDataSet.cpp
@@ -8,10 +8,6 @@ SharedLocalDataSet::SharedLocalDataSet(object_id_t objectId, sid_t sid,
     datasetLock = MutexFactory::instance()->createMutex();
 }
 
-ReturnValue_t SharedLocalDataSet::lockDataset(dur_millis_t mutexTimeout) {
-    return datasetLock->lockMutex(MutexIF::TimeoutType::WAITING, mutexTimeout);
-}
-
 SharedLocalDataSet::SharedLocalDataSet(object_id_t objectId,
         HasLocalDataPoolIF *owner, uint32_t setId,
         const size_t maxSize): SystemObject(objectId),
@@ -20,10 +16,22 @@ SharedLocalDataSet::SharedLocalDataSet(object_id_t objectId,
     datasetLock = MutexFactory::instance()->createMutex();
 }
 
+ReturnValue_t SharedLocalDataSet::lockDataset(MutexIF::TimeoutType timeoutType,
+        dur_millis_t mutexTimeout) {
+    if(datasetLock != nullptr) {
+        return datasetLock->lockMutex(timeoutType, mutexTimeout);
+    }
+    return HasReturnvaluesIF::RETURN_FAILED;
+}
+
+
 SharedLocalDataSet::~SharedLocalDataSet() {
     MutexFactory::instance()->deleteMutex(datasetLock);
 }
 
 ReturnValue_t SharedLocalDataSet::unlockDataset() {
-    return datasetLock->unlockMutex();
+    if(datasetLock != nullptr) {
+        return datasetLock->unlockMutex();
+    }
+    return HasReturnvaluesIF::RETURN_FAILED;
 }
diff --git a/datapoollocal/SharedLocalDataSet.h b/datapoollocal/SharedLocalDataSet.h
index bbb47da49..8d12610a8 100644
--- a/datapoollocal/SharedLocalDataSet.h
+++ b/datapoollocal/SharedLocalDataSet.h
@@ -25,7 +25,8 @@ public:
 
     virtual~ SharedLocalDataSet();
 
-    ReturnValue_t lockDataset(dur_millis_t mutexTimeout) override;
+    ReturnValue_t lockDataset(MutexIF::TimeoutType timeoutType = MutexIF::TimeoutType::WAITING,
+            dur_millis_t mutexTimeout = 20) override;
     ReturnValue_t unlockDataset() override;
 private:
 
diff --git a/unittest/tests/datapoollocal/DataSetTest.cpp b/unittest/tests/datapoollocal/DataSetTest.cpp
index 30b5bb059..ecc1921f1 100644
--- a/unittest/tests/datapoollocal/DataSetTest.cpp
+++ b/unittest/tests/datapoollocal/DataSetTest.cpp
@@ -4,9 +4,9 @@
 #include <catch2/catch_approx.hpp>
 
 #include <fsfw/datapoollocal/HasLocalDataPoolIF.h>
+#include <fsfw/datapoollocal/SharedLocalDataSet.h>
 #include <fsfw/datapoollocal/StaticLocalDataSet.h>
 #include <fsfw/datapool/PoolReadGuard.h>
-#include <fsfw/datapoollocal/SharedLocalDataSet.h>
 #include <fsfw/globalfunctions/bitutility.h>
 
 #include <unittest/core/CatchDefinitions.h>
@@ -254,8 +254,12 @@ TEST_CASE("DataSetTest" , "[DataSetTest]") {
     }
 
     SECTION("SharedDataSet") {
-        object_id_t sharedSetId = objects::SHARED_SET_ID;
-        SharedLocalDataSet sharedSet(sharedSetId, poolOwner, 2, 5);
+//        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 7915eeb4d..9a7639f84 100644
--- a/unittest/tests/datapoollocal/LocalPoolOwnerBase.h
+++ b/unittest/tests/datapoollocal/LocalPoolOwnerBase.h
@@ -36,11 +36,11 @@ 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):
-        StaticLocalDataSet(owner, setId) {
+            StaticLocalDataSet(owner, setId) {
     }
 
     lp_var_t<uint8_t> localPoolVarUint8 = lp_var_t<uint8_t>(lpool::uint8VarGpid, this);