3 files changed, 13 insertions, 7 deletions
diff --git a/test/json.cpp b/test/json.cpp
index ad0cee37..0ad0c709 100644
--- a/test/json.cpp
+++ b/test/json.cpp
@@ -41,7 +41,7 @@ void test_app::test_json() // NOLINT(readability-convert-member-functions-to-sta
     fm_assert(Path::exists(Path::join(loader.TEMP_PATH, "CMakeCache.txt")));
     const auto output_dir = Path::join(loader.TEMP_PATH, "test/."_s);
     {
-        auto atlas = loader.get_ground_atlas("metal1", { 2, 2 }, pass_mode::pass);
+        auto atlas = loader.ground_atlas("metal1");
         json_helper::to_json(atlas, Path::join(output_dir, "atlas.json"));
     }
     {
diff --git a/test/loader.cpp b/test/loader.cpp
index f400ecb3..8910df72 100644
--- a/test/loader.cpp
+++ b/test/loader.cpp
@@ -8,17 +8,23 @@ namespace floormat {
 
 void test_app::test_loader()
 {
-    (void)loader.ground_atlases("ground.json");
+    for (const auto& x : loader.ground_atlas_list())
+        (void)loader.ground_atlas(x.name);
     fm_assert(loader.ground_atlas("texel")->pass_mode() == pass_mode::blocked);
     fm_assert(loader.ground_atlas("metal1")->pass_mode() == pass_mode::pass);
     loader.sceneries();
     for (StringView name : loader.anim_atlas_list())
         loader.anim_atlas(name);
-    (void)loader.wall_atlas_list();
-#if 0
+
+    {   auto walls = loader.wall_atlas_list();
+        fm_assert(!walls.isEmpty());
+        fm_assert(loader.wall_atlas("test1"_s));
+        fm_assert(loader.wall_atlas(loader.INVALID, true));
+        fm_assert(loader.wall_atlas("test1"_s) == loader.wall_atlas("test1"_s));
+        fm_assert(loader.wall_atlas("test1"_s) != loader.wall_atlas(loader.INVALID, true));
+    }
     for (const auto& info : loader.wall_atlas_list())
-        (void)loader.wall_atlas(info.name);
-#endif
+        fm_assert(loader.wall_atlas(info.name));
 }
 
 } // namespace floormat
diff --git a/test/serializer.cpp b/test/serializer.cpp
index c768023e..518962e0 100644
--- a/test/serializer.cpp
+++ b/test/serializer.cpp
@@ -18,7 +18,7 @@ chunk& test_app::make_test_chunk(world& w, chunk_coords_ ch)
     chunk& c = w[ch];
     c.mark_modified();
     auto metal2 = loader.wall_atlas("empty", false);
-    auto tiles  = loader.ground_atlas("tiles", { 8, 5 }, pass_mode::pass);
+    auto tiles  = loader.ground_atlas("tiles");
     constexpr auto N = TILE_MAX_DIM;
     for (auto [x, k, pt] : c)
         x.ground() = { tiles, variant_t(k % tiles->num_tiles()) };