diff --git a/SakuraVNE/src/LayerStack.cpp b/SakuraVNE/src/LayerStack.cpp
index bee6776..208035a 100644
--- a/SakuraVNE/src/LayerStack.cpp
+++ b/SakuraVNE/src/LayerStack.cpp
@@ -3,6 +3,13 @@
 #include <vector>
 
 namespace SakuraVNE {
+LayerStack::~LayerStack() {
+    for (Layer *layer : m_LayerStack) {
+        layer->OnDetach();
+        delete layer;
+    }
+}
+
 void LayerStack::PushLayer(Layer *layer) {
     m_LayerStack.emplace(m_LayerStack.begin() + m_LayerIndex, layer);
     m_LayerIndex++;
diff --git a/SakuraVNE/src/LayerStack.h b/SakuraVNE/src/LayerStack.h
index aa8f870..713adf6 100644
--- a/SakuraVNE/src/LayerStack.h
+++ b/SakuraVNE/src/LayerStack.h
@@ -14,6 +14,10 @@ public:
     void PushOverLay(Layer *layer);
     void PopOverlay(Layer *layer);
 
+#ifdef DEBUG
+    // this is only used for the tests for now, so it will be taken out of the release build
+    inline const std::vector<Layer *> &GetLayers() const { return m_LayerStack; }
+#endif
 private:
     std::vector<Layer *> m_LayerStack;
     unsigned int m_LayerIndex = 0;
diff --git a/SakuraVNE/test/test.cpp b/SakuraVNE/test/test.cpp
index 2b42296..fbaa274 100644
--- a/SakuraVNE/test/test.cpp
+++ b/SakuraVNE/test/test.cpp
@@ -1,3 +1,53 @@
 #include <catch2/catch_test_macros.hpp>
 
+#include "Layer.h"
+#include "LayerStack.h"
+
+#include <iostream>
+#include <vector>
+
+TEST_CASE("Layer operations", "[Layer]") {
+    SakuraVNE::LayerStack lstack;
+    const auto &layers = lstack.GetLayers();
+
+    SakuraVNE::Layer *layer1 = new SakuraVNE::Layer("layer1");
+    lstack.PushLayer(layer1);
+
+    SECTION("PushLayer should make the size 2") {
+        SakuraVNE::Layer *layer2 = new SakuraVNE::Layer("layer2");
+        lstack.PushLayer(layer2);
+        REQUIRE(layers.size() == 2);
+        REQUIRE(layers[1]->GetName() == "layer2");
+    }
+    SECTION("PopLayer should make the size 0") {
+        lstack.PopLayer(layer1);
+        REQUIRE(layers.size() == 0);
+    }
+    SECTION("PushOverlay should always put at the end of the list and should always be after the last fence index") {
+        SakuraVNE::Layer *layer2 = new SakuraVNE::Layer("layer2");
+        lstack.PushOverLay(layer2);
+        REQUIRE(layers[1]->GetName() == "layer2");
+
+        SakuraVNE::Layer *layer3 = new SakuraVNE::Layer("layer3");
+        lstack.PushLayer(layer3);
+
+        REQUIRE(layers[1]->GetName() == "layer3");
+        REQUIRE(layers[2]->GetName() == "layer2");
+    }
+    SECTION("Pop overlay") {
+        SakuraVNE::Layer *layer6 = new SakuraVNE::Layer("layer6");
+        lstack.PushOverLay(layer6);
+        REQUIRE(layers[1]->GetName() == "layer6");
+
+        lstack.PopOverlay(layer6);
+
+        bool hasLayer2InVec = false;
+        for (auto layer : layers) {
+            if (layer->GetName() == "layer6") {
+                hasLayer2InVec = true;
+            }
+        }
+
+        REQUIRE(hasLayer2InVec == false);
+    }
 }