diff --git a/unittest/lib/Makefile.am b/unittest/lib/Makefile.am
index d99d986d1..07a401608 100644
--- a/unittest/lib/Makefile.am
+++ b/unittest/lib/Makefile.am
@@ -17,7 +17,8 @@ tests_SOURCES = \
 				TestVirtualObjectIdManager.cpp \
 				TestZeroMQChannel.cpp \
 				TestSwitchContainer.cpp \
-				TestSwitchConfigContainer.cpp
+				TestSwitchConfigContainer.cpp \
+				TestSkipRecordAttrContainer.cpp
 
 tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON)
 tests_LDADD = $(LDADD_GTEST) $(top_srcdir)/lib/libSaiRedis.a -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
diff --git a/unittest/lib/TestSkipRecordAttrContainer.cpp b/unittest/lib/TestSkipRecordAttrContainer.cpp
new file mode 100644
index 000000000..b6c80f3b0
--- /dev/null
+++ b/unittest/lib/TestSkipRecordAttrContainer.cpp
@@ -0,0 +1,51 @@
+#include "SkipRecordAttrContainer.h"
+
+#include <gtest/gtest.h>
+
+#include <memory>
+
+using namespace sairedis;
+
+TEST(SkipRecordAttrContainer, add)
+{
+    auto srac = std::make_shared<SkipRecordAttrContainer>();
+
+    EXPECT_FALSE(srac->add(SAI_OBJECT_TYPE_PORT, 10000));
+
+    EXPECT_FALSE(srac->add(SAI_OBJECT_TYPE_PORT, SAI_PORT_ATTR_INGRESS_ACL));
+
+    EXPECT_TRUE(srac->add(SAI_OBJECT_TYPE_PORT, SAI_PORT_ATTR_TYPE));
+}
+
+TEST(SkipRecordAttrContainer, remove)
+{
+    auto srac = std::make_shared<SkipRecordAttrContainer>();
+
+    EXPECT_FALSE(srac->remove(SAI_OBJECT_TYPE_PORT, 10000));
+
+    EXPECT_TRUE(srac->add(SAI_OBJECT_TYPE_PORT, SAI_PORT_ATTR_TYPE));
+    
+    EXPECT_FALSE(srac->remove(SAI_OBJECT_TYPE_PORT, 10000));
+
+    EXPECT_TRUE(srac->remove(SAI_OBJECT_TYPE_PORT, SAI_PORT_ATTR_TYPE));
+}
+
+TEST(SkipRecordAttrContainer, clear)
+{
+    auto srac = std::make_shared<SkipRecordAttrContainer>();
+
+    EXPECT_TRUE(srac->remove(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_AVAILABLE_ACL_TABLE_GROUP));
+
+    srac->clear();
+    
+    EXPECT_FALSE(srac->remove(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_AVAILABLE_ACL_TABLE));
+}
+
+TEST(SkipRecordAttrContainer, canSkipRecording)
+{
+    auto srac = std::make_shared<SkipRecordAttrContainer>();
+
+    EXPECT_FALSE(srac->canSkipRecording(SAI_OBJECT_TYPE_SWITCH, 0, nullptr));
+
+    EXPECT_FALSE(srac->canSkipRecording(SAI_OBJECT_TYPE_SWITCH, 1, nullptr));
+}
diff --git a/unittest/lib/TestSwitchConfigContainer.cpp b/unittest/lib/TestSwitchConfigContainer.cpp
index 87e37a4b9..429465d6b 100644
--- a/unittest/lib/TestSwitchConfigContainer.cpp
+++ b/unittest/lib/TestSwitchConfigContainer.cpp
@@ -18,7 +18,7 @@ TEST(SwitchConfigContainer, insert)
     EXPECT_THROW(scc->insert(sc), std::runtime_error);
     EXPECT_THROW(scc->insert(sc1), std::runtime_error);
 }
-    
+
 TEST(SwitchConfigContainer, getConfig)
 {
     auto sc0 = std::make_shared<SwitchConfig>(0, "0");