1 files changed, 30 insertions, 37 deletions
diff --git a/test/app.hpp b/test/app.hpp
index d7dfa19e..7e2381bc 100644
--- a/test/app.hpp
+++ b/test/app.hpp
@@ -1,8 +1,6 @@
 #pragma once
 #undef FM_NO_DEBUG
 #include "compat/assert.hpp"
-#include "compat/headless.hpp"
-#include <Magnum/Magnum.h>
 
 namespace floormat {
 
@@ -11,42 +9,37 @@ struct chunk_coords_;
 class chunk;
 class world;
 
-struct test_app final : private FM_APPLICATION
-{
-    using Application = FM_APPLICATION;
-    explicit test_app(const Arguments& arguments);
-    ~test_app();
+} // namespace floormat
 
-    static chunk& make_test_chunk(world& w, chunk_coords_ ch);
+namespace floormat::Test {
 
-    int exec() override;
+chunk& make_test_chunk(world& w, chunk_coords_ ch);
 
-    static void test_astar();
-    static void test_astar_pool();
-    static void test_bitmask();
-    static void test_bptr();
-    static void test_coords();
-    static void test_critter();
-    static void test_dijkstra();
-    static void test_entity();
-    static void test_hash();
-    static void test_iptr();
-    static void test_json();
-    static void test_json2();
-    static void test_json3();
-    static void test_loader();
-    static void test_loader2();
-    static void test_loader3();
-    static void test_magnum_math();
-    static void test_math();
-    static void test_raycast();
-    static void test_region();
-    static void test_save();
-    static void test_saves();
-    static void test_script();
-    static void test_wall_atlas();
-    static void test_wall_atlas2();
+void test_astar();
+void test_astar_pool();
+void test_bitmask();
+void test_bptr();
+void test_coords();
+void test_critter();
+void test_dijkstra();
+void test_entity();
+void test_hash();
+void test_iptr();
+void test_json();
+void test_json2();
+void test_json3();
+void test_loader();
+void test_loader2();
+void test_loader3();
+void test_magnum_math();
+void test_math();
+void test_raycast();
+void test_region();
+void test_save();
+void test_saves();
+void test_script();
+void test_wall_atlas();
+void test_wall_atlas2();
+void test_zzz_misc();
 
-    static void test_zzz_misc();
-};
-} // namespace floormat
+} // namespace floormat::Test