diff --git a/src/app/core/testable.h b/src/app/core/testable.h
new file mode 100644
index 00000000..1199f3de
--- /dev/null
+++ b/src/app/core/testable.h
@@ -0,0 +1,19 @@
+#ifndef YAZE_APP_CORE_TESTABLE_H
+#define YAZE_APP_CORE_TESTABLE_H
+
+#include <imgui_test_engine/imgui_te_context.h>
+
+namespace yaze {
+namespace app {
+namespace core {
+class GuiTestable {
+ public:
+  virtual void RegisterTests(ImGuiTestEngine* e) = 0;
+
+  ImGuiTestEngine* test_engine;
+};
+}  // namespace core
+}  // namespace app
+}  // namespace yaze
+
+#endif  // YAZE_APP_CORE_TESTABLE_H
\ No newline at end of file
diff --git a/src/app/editor/master_editor.h b/src/app/editor/master_editor.h
index b3732116..846b6225 100644
--- a/src/app/editor/master_editor.h
+++ b/src/app/editor/master_editor.h
@@ -14,6 +14,7 @@
 #include "app/core/common.h"
 #include "app/core/constants.h"
 #include "app/core/project.h"
+#include "app/core/testable.h"
 #include "app/editor/code/assembly_editor.h"
 #include "app/editor/code/memory_editor.h"
 #include "app/editor/dungeon/dungeon_editor.h"
@@ -36,16 +37,6 @@
 
 namespace yaze {
 namespace app {
-
-namespace core {
-class GuiTestable {
- public:
-  virtual void RegisterTests(ImGuiTestEngine* e) = 0;
-
-  ImGuiTestEngine* test_engine;
-};
-}  // namespace core
-
 namespace editor {
 
 /**