diff --git a/test/integration/test_editor.cc b/test/test_editor.cc
similarity index 95%
rename from test/integration/test_editor.cc
rename to test/test_editor.cc
index 2ab1280e..d144c4de 100644
--- a/test/integration/test_editor.cc
+++ b/test/test_editor.cc
@@ -1,4 +1,4 @@
-#include "test/integration/test_editor.h"
+#include "test/test_editor.h"
 
 #include <SDL.h>
 
@@ -81,7 +81,10 @@ int RunIntegrationTest() {
 
   while (controller.IsActive()) {
     controller.OnInput();
-    test_editor.Update();
+    auto status = test_editor.Update();
+    if (!status.ok()) {
+      return EXIT_FAILURE;
+    }
     controller.DoRender();
   }
 
diff --git a/test/integration/test_editor.h b/test/test_editor.h
similarity index 98%
rename from test/integration/test_editor.h
rename to test/test_editor.h
index 17149c20..f68dfce4 100644
--- a/test/integration/test_editor.h
+++ b/test/test_editor.h
@@ -2,7 +2,6 @@
 #define YAZE_TEST_INTEGRATION_TEST_EDITOR_H
 
 #include "app/editor/editor.h"
-#include "imgui/imgui.h"
 #include "imgui_test_engine/imgui_te_context.h"
 #include "imgui_test_engine/imgui_te_engine.h"
 
diff --git a/test/yaze_test.cc b/test/yaze_test.cc
index e86e535b..018563c7 100644
--- a/test/yaze_test.cc
+++ b/test/yaze_test.cc
@@ -4,7 +4,7 @@
 
 #include "absl/debugging/failure_signal_handler.h"
 #include "absl/debugging/symbolize.h"
-#include "test/integration/test_editor.h"
+#include "test/test_editor.h"
 
 int main(int argc, char* argv[]) {
   absl::InitializeSymbolizer(argv[0]);
diff --git a/test/zelda3/overworld_test.cc b/test/zelda3/overworld_test.cc
index 8546566d..8b432db6 100644
--- a/test/zelda3/overworld_test.cc
+++ b/test/zelda3/overworld_test.cc
@@ -5,7 +5,6 @@
 
 #include "app/rom.h"
 #include "app/zelda3/overworld/overworld.h"
-#include "app/zelda3/overworld/overworld_map.h"
 #include "test/testing.h"
 
 namespace yaze {