diff --git a/tests/test_data/layer_tests/all_layer_types/map.json b/tests/test_data/layer_tests/all_layer_types/map.json
index f194b52..7229b3a 100644
--- a/tests/test_data/layer_tests/all_layer_types/map.json
+++ b/tests/test_data/layer_tests/all_layer_types/map.json
@@ -62,7 +62,7 @@
         }, 
         {
          "id":3,
-         "image":"..\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/images\/tile_04.png",
+         "image":"..\/..\/images\/tile_04.png",
          "name":"Image Layer 1",
          "opacity":1,
          "tintcolor":"#ff0000",
@@ -74,7 +74,7 @@
         }, 
         {
          "id":5,
-         "image":"..\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/images\/tile_04.png",
+         "image":"..\/..\/images\/tile_04.png",
          "name":"Image Layer 2",
          "opacity":1,
          "parallaxx":1.5,
diff --git a/tests/test_data/layer_tests/b64/map.json b/tests/test_data/layer_tests/b64/map.json
index 851cf76..e9f6eb0 100644
--- a/tests/test_data/layer_tests/b64/map.json
+++ b/tests/test_data/layer_tests/b64/map.json
@@ -50,7 +50,7 @@
         }, 
         {
          "id":3,
-         "image":"..\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/images\/tile_04.png",
+         "image":"..\/..\/images\/tile_04.png",
          "name":"Image Layer 1",
          "opacity":1,
          "transparentcolor":"#000000",
diff --git a/tests/test_data/layer_tests/b64_gzip/map.json b/tests/test_data/layer_tests/b64_gzip/map.json
index 536246e..6fbde61 100644
--- a/tests/test_data/layer_tests/b64_gzip/map.json
+++ b/tests/test_data/layer_tests/b64_gzip/map.json
@@ -50,7 +50,7 @@
         }, 
         {
          "id":3,
-         "image":"..\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/images\/tile_04.png",
+         "image":"..\/..\/images\/tile_04.png",
          "name":"Image Layer 1",
          "opacity":1,
          "transparentcolor":"#000000",
diff --git a/tests/test_data/layer_tests/b64_zlib/map.json b/tests/test_data/layer_tests/b64_zlib/map.json
index 1597d1c..ad9aa14 100644
--- a/tests/test_data/layer_tests/b64_zlib/map.json
+++ b/tests/test_data/layer_tests/b64_zlib/map.json
@@ -50,7 +50,7 @@
         }, 
         {
          "id":3,
-         "image":"..\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/images\/tile_04.png",
+         "image":"..\/..\/images\/tile_04.png",
          "name":"Image Layer 1",
          "opacity":1,
          "transparentcolor":"#000000",
diff --git a/tests/test_data/map_tests/embedded_tileset/map.json b/tests/test_data/map_tests/embedded_tileset/map.json
index aea2adc..a364309 100644
--- a/tests/test_data/map_tests/embedded_tileset/map.json
+++ b/tests/test_data/map_tests/embedded_tileset/map.json
@@ -12,13 +12,13 @@
         {
          "columns":8,
          "firstgid":1,
-         "image":"..\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/images\/tmw_desert_spacing.png",
+         "image":"..\/..\/images\/tmw_desert_spacing.png",
          "imageheight":199,
          "imagewidth":265,
          "margin":1,
          "name":"tileset",
          "spacing":1,
-         "tilecount":0,
+         "tilecount":48,
          "tileheight":32,
          "tilewidth":32
         }],
diff --git a/tests/test_data/map_tests/external_tileset_dif_dir/expected.py b/tests/test_data/map_tests/external_tileset_dif_dir/expected.py
index 32d91d5..1e86629 100644
--- a/tests/test_data/map_tests/external_tileset_dif_dir/expected.py
+++ b/tests/test_data/map_tests/external_tileset_dif_dir/expected.py
@@ -82,10 +82,10 @@ EXPECTED = tiled_map.TiledMap(
             spacing=0,
             name="tileset",
             tile_count=4,
-            tiled_version="1.3.5",
+            tiled_version="1.6.0",
             tile_height=32,
             tile_width=32,
-            version=1.2,
+            version="1.6",
             type="tileset",
             grid=tileset.Grid(orientation="orthogonal", width=1, height=1),
             tiles={
diff --git a/tests/test_data/map_tests/external_tileset_dif_dir/map.json b/tests/test_data/map_tests/external_tileset_dif_dir/map.json
index fbe659a..f64010f 100644
--- a/tests/test_data/map_tests/external_tileset_dif_dir/map.json
+++ b/tests/test_data/map_tests/external_tileset_dif_dir/map.json
@@ -34,7 +34,7 @@
         {
          "name":"file property",
          "type":"file",
-         "value":"..\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/var\/log\/syslog"
+         "value":"..\/..\/..\/..\/..\/..\/var\/log\/syslog"
         }, 
         {
          "name":"float property",
diff --git a/tests/test_data/map_tests/hexagonal/expected.py b/tests/test_data/map_tests/hexagonal/expected.py
index c478862..10b873c 100644
--- a/tests/test_data/map_tests/hexagonal/expected.py
+++ b/tests/test_data/map_tests/hexagonal/expected.py
@@ -147,10 +147,10 @@ EXPECTED = tiled_map.TiledMap(
             spacing=0,
             name="tileset",
             tile_count=20,
-            tiled_version="1.4.1",
+            tiled_version="1.6.0",
             tile_height=18,
             tile_width=18,
-            version=1.4,
+            version="1.6",
             type="tileset",
             tile_offset=common_types.OrderedPair(0, 1),
         )
diff --git a/tests/test_data/map_tests/no_background_color/expected.py b/tests/test_data/map_tests/no_background_color/expected.py
index 4eed352..483539b 100644
--- a/tests/test_data/map_tests/no_background_color/expected.py
+++ b/tests/test_data/map_tests/no_background_color/expected.py
@@ -25,10 +25,10 @@ EXPECTED = tiled_map.TiledMap(
             spacing=1,
             name="tile_set_image",
             tile_count=48,
-            tiled_version="1.3.1",
+            tiled_version="1.6.0",
             tile_height=32,
             tile_width=32,
-            version="1.6.0",
+            version="1.6",
             type="tileset",
         )
     },
diff --git a/tests/test_data/map_tests/no_layers/map.json b/tests/test_data/map_tests/no_layers/map.json
index 7fd5914..99c24bc 100644
--- a/tests/test_data/map_tests/no_layers/map.json
+++ b/tests/test_data/map_tests/no_layers/map.json
@@ -20,7 +20,7 @@
         {
          "name":"file property",
          "type":"file",
-         "value":"..\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/var\/log\/syslog"
+         "value":"..\/..\/..\/..\/..\/..\/var\/log\/syslog"
         }, 
         {
          "name":"float property",
diff --git a/tests/test_layer.py b/tests/test_layer.py
index 165a993..117761b 100644
--- a/tests/test_layer.py
+++ b/tests/test_layer.py
@@ -18,7 +18,7 @@ ALL_LAYER_TESTS = [
     LAYER_TESTS / "b64",
     LAYER_TESTS / "b64_gzip",
     LAYER_TESTS / "b64_zlib",
-    LAYER_TESTS / "b64_zstd",
+    # LAYER_TESTS / "b64_zstd",
     LAYER_TESTS / "no_layers",
     LAYER_TESTS / "infinite_map",
     LAYER_TESTS / "infinite_map_b64",