diff --git a/.DS_Store b/.DS_Store
index 0a708c7..fd0860f 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/tests/UnitTests/BSTUnitTest.cpp b/tests/UnitTests/BSTUnitTest.cpp
index 7a08954..df9e56f 100644
--- a/tests/UnitTests/BSTUnitTest.cpp
+++ b/tests/UnitTests/BSTUnitTest.cpp
@@ -16,16 +16,11 @@ class BSTUnitTest : public testing::Test
 {
 protected:
     DoubleComparator comparator;
-    BinarySearchTree<double> *bst;
+    std::unique_ptr<BinarySearchTree<double>> bst;
 
     void SetUp() override
     {
-        bst = new BinarySearchTree<double>(&comparator);
-    }
-
-    void TearDown() override
-    {
-        delete bst;
+        bst = std::make_unique<BinarySearchTree<double>>(&comparator);
     }
 };
 
diff --git a/tests/UnitTests/RBTUnitTest.cpp b/tests/UnitTests/RBTUnitTest.cpp
index b177885..cb07b12 100644
--- a/tests/UnitTests/RBTUnitTest.cpp
+++ b/tests/UnitTests/RBTUnitTest.cpp
@@ -14,16 +14,11 @@
 class RBTUnitTest : public testing::Test
 {
 protected:
-    RedBlackTree<double> *rbt;
+    std::unique_ptr<RedBlackTree<double>> rbt;
 
     void SetUp() override
     {
-        rbt = new RedBlackTree<double>();
-    }
-
-    void TearDown() override
-    {
-        delete rbt;
+        rbt = std::make_unique<RedBlackTree<double>>();
     }
 };
 
@@ -37,7 +32,7 @@ TEST_F(RBTUnitTest, IteratorGeneralTest)
     rbt->add(7.0);
 
     auto iter = rbt->iterator();
-    ASSERT_TRUE(iter != NULL);
+    ASSERT_TRUE(iter != nullptr);
 
     ASSERT_TRUE(iter->hasNext());
     ASSERT_DOUBLE_EQ(iter->next(), 3.0);