diff --git a/tests/rsrc/bundles/tiles/ground/bundle.xml b/tests/rsrc/bundles/tiles/ground/bundle.xml
index 18a619889..2b11cdccc 100644
--- a/tests/rsrc/bundles/tiles/ground/bundle.xml
+++ b/tests/rsrc/bundles/tiles/ground/bundle.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" standalone="yes"?>
-<!-- $Id: bundle.xml,v 1.4 2002/04/06 22:17:09 ray Exp $ -->
+<!-- $Id: bundle.xml,v 1.5 2002/04/27 05:16:01 mdb Exp $ -->
 
 <!-- Ground tile bundle tileset descriptions. -->
 <bundle>
   <base>
-    <tileset name="Cobble">
+    <tileset name="Outdoors/Cobble">
       <imagePath>cobble.png</imagePath>
       <heights>48</heights>
       <widths>64</widths>
@@ -12,7 +12,7 @@
       <passable>1, 1, 1</passable>
     </tileset>
 
-    <tileset name="Dirt">
+    <tileset name="Outdoors/Dirt">
       <imagePath>dirt.png</imagePath>
       <heights>48</heights>
       <widths>64</widths>
@@ -20,7 +20,7 @@
       <passable>1, 1, 1</passable>
     </tileset>
 
-    <tileset name="Sand">
+    <tileset name="Outdoors/Sand">
       <imagePath>sand.png</imagePath>
       <heights>48</heights>
       <widths>64</widths>
@@ -28,7 +28,7 @@
       <passable>1, 1, 1</passable>
     </tileset>
 
-    <tileset name="Wood Planks">
+    <tileset name="Outdoors/Wood Planks">
       <imagePath>woodplanks.png</imagePath>
       <heights>48</heights>
       <widths>64</widths>
@@ -36,7 +36,7 @@
       <passable>1, 1, 1</passable>
     </tileset>
 
-    <tileset name="Seawater">
+    <tileset name="Outdoors/Seawater">
       <imagePath>seawater.png</imagePath>
       <heights>48</heights>
       <widths>64</widths>
@@ -53,14 +53,14 @@
       <tileCounts>8, 8, 8, 8, 8</tileCounts>
     </tileset>
 
-    <tileset name="Seawater_fringe">
+    <tileset name="Seawater fringe">
       <imagePath>seafringe.png</imagePath>
       <heights>48</heights>
       <widths>64</widths>
       <tileCounts>17</tileCounts>
     </tileset>
 
-    <tileset name="generic_fringe">
+    <tileset name="Generic fringe">
       <imagePath>fringemask.png</imagePath>
       <heights>48</heights>
       <widths>64</widths>
diff --git a/tests/rsrc/bundles/tiles/objects/bag_cloth.png b/tests/rsrc/bundles/tiles/objects/bag_cloth.png
new file mode 100644
index 000000000..09eebd9ae
Binary files /dev/null and b/tests/rsrc/bundles/tiles/objects/bag_cloth.png differ
diff --git a/tests/rsrc/bundles/tiles/objects/barrel_oak.png b/tests/rsrc/bundles/tiles/objects/barrel_oak.png
new file mode 100644
index 000000000..e89c18af1
Binary files /dev/null and b/tests/rsrc/bundles/tiles/objects/barrel_oak.png differ
diff --git a/tests/rsrc/bundles/tiles/objects/building.png b/tests/rsrc/bundles/tiles/objects/building.png
deleted file mode 100644
index 16fca4818..000000000
Binary files a/tests/rsrc/bundles/tiles/objects/building.png and /dev/null differ
diff --git a/tests/rsrc/bundles/tiles/objects/bundle.xml b/tests/rsrc/bundles/tiles/objects/bundle.xml
index ba41d14be..fe77b1733 100644
--- a/tests/rsrc/bundles/tiles/objects/bundle.xml
+++ b/tests/rsrc/bundles/tiles/objects/bundle.xml
@@ -1,88 +1,137 @@
 <?xml version="1.0" standalone="yes"?>
-<!-- $Id: bundle.xml,v 1.3 2001/12/18 09:17:20 mdb Exp $ -->
+<!-- $Id: bundle.xml,v 1.4 2002/04/27 05:16:01 mdb Exp $ -->
 
 <!-- Object tile bundle tileset descriptions. -->
 <bundle>
   <object>
-    <tileset name="Building">
-      <imagePath>building.png</imagePath>
-      <widths>224</widths>
-      <heights>293</heights>
-      <tileCounts>4</tileCounts>
-      <offsetPos>2, 2</offsetPos>
-      <gapSize>4, 0</gapSize>
-      <objectWidths>4, 3, 4, 3</objectWidths>
-      <objectHeights>3, 4, 3, 4</objectHeights>
-    </tileset>
-
-    <tileset name="Tavern">
-      <imagePath>tavern.png</imagePath>
-      <widths>289</widths>
-      <heights>291</heights>
-      <tileCounts>4</tileCounts>
-      <offsetPos>3, 3</offsetPos>
-      <gapSize>7, 0</gapSize>
-      <objectWidths>3, 6, 3, 6</objectWidths>
-      <objectHeights>6, 3, 6, 3</objectHeights>
-    </tileset>
-
-    <tileset name="Bush">
-      <imagePath>bush.png</imagePath>
-      <widths>150</widths>
-      <heights>150</heights>
+    <tileset name="Outdoors/Building">
+      <imagePath>house.png</imagePath>
+      <widths>380</widths>
+      <heights>480</heights>
       <tileCounts>4</tileCounts>
       <offsetPos>0, 0</offsetPos>
       <gapSize>0, 0</gapSize>
-      <objectWidths>2, 2, 2, 2</objectWidths>
-      <objectHeights>2, 2, 2, 2</objectHeights>
-      <xOrigins>75, 75, 75, 75</xOrigins>
-      <yOrigins>140, 140, 140, 140</yOrigins>
+      <objectWidths>4, 5, 4, 5</objectWidths>
+      <objectHeights>5, 4, 5, 4</objectHeights>
+      <xOrigins>173, 205, 173, 205</xOrigins>
+      <yOrigins>466, 466, 466, 466</yOrigins>
     </tileset>
 
-    <tileset name="Chest and booty">
-      <imagePath>chest_extra.png</imagePath>
-      <widths>150</widths>
-      <heights>150</heights>
-      <tileCounts>4</tileCounts>
-      <offsetPos>0, 0</offsetPos>
-      <gapSize>0, 0</gapSize>
-      <objectWidths>2, 3, 2, 3</objectWidths>
-      <objectHeights>3, 2, 3, 2</objectHeights>
-    </tileset>
-
-    <tileset name="Chest o' gold">
-      <imagePath>chest_gold.png</imagePath>
-      <widths>130</widths>
-      <heights>130</heights>
-      <tileCounts>4</tileCounts>
-      <offsetPos>0, 0</offsetPos>
-      <gapSize>0, 0</gapSize>
-      <objectWidths>2, 2, 2, 2</objectWidths>
-      <objectHeights>2, 2, 2, 2</objectHeights>
-    </tileset>
-
-    <tileset name="Table">
-      <imagePath>table.png</imagePath>
-      <widths>189</widths>
-      <heights>189</heights>
-      <tileCounts>4</tileCounts>
-      <offsetPos>0, 0</offsetPos>
-      <gapSize>0, 0</gapSize>
-      <objectWidths>3, 3, 3, 3</objectWidths>
-      <objectHeights>3, 3, 3, 3</objectHeights>
-    </tileset>
-
-    <tileset name="Tree">
-      <imagePath>tree.png</imagePath>
+    <tileset name="Outdoors/Tree (palm)">
+      <imagePath> tree_palm.png</imagePath>
       <widths>300</widths>
-      <heights>300</heights>
+      <heights>480</heights>
       <tileCounts>4</tileCounts>
       <offsetPos>0, 0</offsetPos>
       <gapSize>0, 0</gapSize>
-      <objectWidths>2, 2, 2, 2</objectWidths>
-      <objectHeights>2, 2, 2, 2</objectHeights>
-      <xOrigins>145, 155, 150, 145</xOrigins>
-      <yOrigins>300, 300, 300, 300</yOrigins>
+      <objectWidths>1, 1, 1, 1</objectWidths>
+      <objectHeights>1, 1, 1, 1</objectHeights>
+      <xOrigins>149, 149, 149, 149</xOrigins>
+      <yOrigins>456, 456, 456, 456</yOrigins>
+    </tileset>
+
+    <tileset name="Outdoors/Dock edge">
+      <imagePath>dockedge.png</imagePath>
+      <widths>100</widths>
+      <heights>200</heights>
+      <tileCounts>4</tileCounts>
+      <offsetPos>0, 0</offsetPos>
+      <gapSize>0, 0</gapSize>
+      <objectWidths>1, 1, 1, 1</objectWidths>
+      <objectHeights>1, 1, 1, 1</objectHeights>
+      <xOrigins>49, 49, 49, 49</xOrigins>
+      <yOrigins>176, 176, 176, 176</yOrigins>
+    </tileset>
+
+    <tileset name="Outdoors/Bag (cloth)">
+      <imagePath>bag_cloth.png</imagePath>
+      <widths>100</widths>
+      <heights>200</heights>
+      <tileCounts>1</tileCounts>
+      <offsetPos>0, 0</offsetPos>
+      <gapSize>0, 0</gapSize>
+      <objectWidths>1</objectWidths>
+      <objectHeights>1</objectHeights>
+      <xOrigins>49</xOrigins>
+      <yOrigins>176</yOrigins>
+    </tileset>
+
+    <tileset name="Outdoors/Barrel (oak)">
+      <imagePath>barrel_oak.png</imagePath>
+      <widths>100</widths>
+      <heights>200</heights>
+      <tileCounts>1</tileCounts>
+      <offsetPos>0, 0</offsetPos>
+      <gapSize>0, 0</gapSize>
+      <objectWidths>1</objectWidths>
+      <objectHeights>1</objectHeights>
+      <xOrigins>49</xOrigins>
+      <yOrigins>176</yOrigins>
+    </tileset>
+
+    <tileset name="Outdoors/Crate">
+      <imagePath>crate.png</imagePath>
+      <widths>100</widths>
+      <heights>200</heights>
+      <tileCounts>2</tileCounts>
+      <offsetPos>0, 0</offsetPos>
+      <gapSize>0, 0</gapSize>
+      <objectWidths>1, 1</objectWidths>
+      <objectHeights>1, 1</objectHeights>
+      <xOrigins>49, 49</xOrigins>
+      <yOrigins>176, 176</yOrigins>
+    </tileset>
+
+    <tileset name="Outdoors/Mooring">
+      <imagePath>mooring.png</imagePath>
+      <widths>100</widths>
+      <heights>200</heights>
+      <tileCounts>4</tileCounts>
+      <offsetPos>0, 0</offsetPos>
+      <gapSize>0, 0</gapSize>
+      <objectWidths>1, 1, 1, 1</objectWidths>
+      <objectHeights>1, 1, 1, 1</objectHeights>
+      <xOrigins>49, 49, 49, 49</xOrigins>
+      <yOrigins>176, 176, 176, 176</yOrigins>
+    </tileset>
+
+    <tileset name="Outdoors/Tree (oak)">
+      <imagePath>tree_oak.png</imagePath>
+      <widths>300</widths>
+      <heights>480</heights>
+      <tileCounts>2</tileCounts>
+      <offsetPos>0, 0</offsetPos>
+      <gapSize>0, 0</gapSize>
+      <objectWidths>1, 1</objectWidths>
+      <objectHeights>1, 1</objectHeights>
+      <xOrigins>149, 149</xOrigins>
+      <yOrigins>456, 456</yOrigins>
+    </tileset>
+
+    <tileset name="Outdoors/Chest (treasure)">
+      <imagePath>chest_treasure.png</imagePath>
+      <widths>200</widths>
+      <heights>280</heights>
+      <tileCounts>2</tileCounts>
+      <offsetPos>0, 0</offsetPos>
+      <gapSize>0, 0</gapSize>
+      <objectWidths>2, 2</objectWidths>
+      <objectHeights>2, 2</objectHeights>
+      <xOrigins>99, 99</xOrigins>
+      <yOrigins>245, 245</yOrigins>
+    </tileset>
+
+    <tileset name="Outdoors/Well">
+      <imagePath>well.png</imagePath>
+      <widths>200</widths>
+      <heights>280</heights>
+      <tileCounts>2</tileCounts>
+      <offsetPos>0, 0</offsetPos>
+      <gapSize>0, 0</gapSize>
+      <objectWidths>2, 2</objectWidths>
+      <objectHeights>2, 2</objectHeights>
+      <xOrigins>99, 99</xOrigins>
+      <yOrigins>245, 245</yOrigins>
     </tileset>
   </object>
 </bundle>
diff --git a/tests/rsrc/bundles/tiles/objects/bush.png b/tests/rsrc/bundles/tiles/objects/bush.png
deleted file mode 100644
index f38523ece..000000000
Binary files a/tests/rsrc/bundles/tiles/objects/bush.png and /dev/null differ
diff --git a/tests/rsrc/bundles/tiles/objects/chest_extra.png b/tests/rsrc/bundles/tiles/objects/chest_extra.png
deleted file mode 100644
index a50ccd789..000000000
Binary files a/tests/rsrc/bundles/tiles/objects/chest_extra.png and /dev/null differ
diff --git a/tests/rsrc/bundles/tiles/objects/chest_gold.png b/tests/rsrc/bundles/tiles/objects/chest_gold.png
deleted file mode 100644
index 9903ddf20..000000000
Binary files a/tests/rsrc/bundles/tiles/objects/chest_gold.png and /dev/null differ
diff --git a/tests/rsrc/bundles/tiles/objects/chest_purse.png b/tests/rsrc/bundles/tiles/objects/chest_purse.png
new file mode 100644
index 000000000..212ee1726
Binary files /dev/null and b/tests/rsrc/bundles/tiles/objects/chest_purse.png differ
diff --git a/tests/rsrc/bundles/tiles/objects/chest_treasure.png b/tests/rsrc/bundles/tiles/objects/chest_treasure.png
new file mode 100644
index 000000000..9bab9fb6f
Binary files /dev/null and b/tests/rsrc/bundles/tiles/objects/chest_treasure.png differ
diff --git a/tests/rsrc/bundles/tiles/objects/crate.png b/tests/rsrc/bundles/tiles/objects/crate.png
new file mode 100644
index 000000000..f5befa890
Binary files /dev/null and b/tests/rsrc/bundles/tiles/objects/crate.png differ
diff --git a/tests/rsrc/bundles/tiles/objects/dockedge.png b/tests/rsrc/bundles/tiles/objects/dockedge.png
new file mode 100644
index 000000000..bf1270908
Binary files /dev/null and b/tests/rsrc/bundles/tiles/objects/dockedge.png differ
diff --git a/tests/rsrc/bundles/tiles/objects/house.png b/tests/rsrc/bundles/tiles/objects/house.png
new file mode 100644
index 000000000..6b96766c9
Binary files /dev/null and b/tests/rsrc/bundles/tiles/objects/house.png differ
diff --git a/tests/rsrc/bundles/tiles/objects/mooring.png b/tests/rsrc/bundles/tiles/objects/mooring.png
new file mode 100644
index 000000000..e11d98b9a
Binary files /dev/null and b/tests/rsrc/bundles/tiles/objects/mooring.png differ
diff --git a/tests/rsrc/bundles/tiles/objects/table.png b/tests/rsrc/bundles/tiles/objects/table.png
deleted file mode 100644
index 8796a22a3..000000000
Binary files a/tests/rsrc/bundles/tiles/objects/table.png and /dev/null differ
diff --git a/tests/rsrc/bundles/tiles/objects/tavern.png b/tests/rsrc/bundles/tiles/objects/tavern.png
deleted file mode 100644
index 2e47dc78c..000000000
Binary files a/tests/rsrc/bundles/tiles/objects/tavern.png and /dev/null differ
diff --git a/tests/rsrc/bundles/tiles/objects/tree.png b/tests/rsrc/bundles/tiles/objects/tree.png
deleted file mode 100644
index 634080b6f..000000000
Binary files a/tests/rsrc/bundles/tiles/objects/tree.png and /dev/null differ
diff --git a/tests/rsrc/bundles/tiles/objects/tree_oak.png b/tests/rsrc/bundles/tiles/objects/tree_oak.png
new file mode 100644
index 000000000..eaf1d931b
Binary files /dev/null and b/tests/rsrc/bundles/tiles/objects/tree_oak.png differ
diff --git a/tests/rsrc/bundles/tiles/objects/tree_palm.png b/tests/rsrc/bundles/tiles/objects/tree_palm.png
new file mode 100644
index 000000000..3c143b0c3
Binary files /dev/null and b/tests/rsrc/bundles/tiles/objects/tree_palm.png differ
diff --git a/tests/rsrc/bundles/tiles/objects/well.png b/tests/rsrc/bundles/tiles/objects/well.png
new file mode 100644
index 000000000..bb35cb9d2
Binary files /dev/null and b/tests/rsrc/bundles/tiles/objects/well.png differ
diff --git a/tests/rsrc/config/miso/tile/fringeconf.xml b/tests/rsrc/config/miso/tile/fringeconf.xml
index 05cc8fcfd..2a6dce673 100644
--- a/tests/rsrc/config/miso/tile/fringeconf.xml
+++ b/tests/rsrc/config/miso/tile/fringeconf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
-<!-- $Id: fringeconf.xml,v 1.1 2002/04/06 22:14:38 ray Exp $ -->
+<!-- $Id: fringeconf.xml,v 1.2 2002/04/27 05:16:01 mdb Exp $ -->
 
 <!-- If a base tileset is defined in this file, it will be fringed over
      another base if and only if
@@ -17,25 +17,23 @@
    The values tell what kind of fringe is at that index.
 
 -->
-<fringe tiles="8, 56, 32, 14, 224,       2, 131, 128, 227, 143,
-               248, 62, 251, 239, 191,   254, 255">
-
+<fringe>
   <!-- Seawater fringes on most things. -->
-  <base name="Seawater" priority="20">
-    <tileset name="Seawater_fringe" mask="false"/>
-    <tileset name="generic_fringe" mask="true"/>
+  <base name="Outdoors/Seawater" priority="20">
+    <tileset name="Seawater fringe" mask="false"/>
+    <tileset name="Generic fringe" mask="true"/>
   </base>
 
   <!-- Cobble should fringe on things like dirt and grass. -->
-  <base name="Cobble" priority="10">
-     <tileset name="generic_fringe" mask="true"/>
+  <base name="Outdoors/Cobble" priority="10">
+     <tileset name="Generic fringe" mask="true"/>
   </base>
 
-  <base name="Sand" priority="5">
-     <tileset name="generic_fringe" mask="true"/>
+  <base name="Outdoors/Sand" priority="5">
+     <tileset name="Generic fringe" mask="true"/>
   </base>
 
   <!-- Wood does not fringe nor should be fringed upon. -->
-  <base name="Wood Planks" priority="100">
+  <base name="Outdoors/Wood Planks" priority="100">
   </base>
 </fringe>
diff --git a/tests/rsrc/scenes/arboretum.xml b/tests/rsrc/scenes/arboretum.xml
deleted file mode 100644
index 22415d404..000000000
--- a/tests/rsrc/scenes/arboretum.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-
-  <miso>
-    <width>22</width>
-    <height>22</height>
-    <base>786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 720896, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 720896, 720896, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 720896, 720896, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 720896, 720896, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 720896, 720896, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 720896, 720896, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 720896, 720896, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 720896, 720896, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 720896, 720896, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 720896, 720896, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 720896, 720896, 720896, 720896, 720896, 720896, 720896, 720896, 720896, 720896, 720896, 720896, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 720896, 720896, 720896, 720896, 720896, 720896, 720896, 720896, 720896, 720896, 720896, 720896, 720896, 720896, 720896, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 720896, 720896, 720896, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433, 786433</base>
-    <fringe>0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0</fringe>
-    <object>10, 1, 393218, 11, 3, 393219, 9, 4, 393216, 14, 5, 393218, 10, 6, 393218, 12, 7, 393216, 16, 8, 393218, 11, 9, 393219, 14, 10, 393216, 9, 11, 655361, 12, 11, 393218, 17, 11, 393218, 20, 11, 393218, 5, 12, 655362, 14, 15, 393216, 12, 16, 327683, 13, 19, 655361</object>
-    <actions>, , , , , , , , , , , , , , , , </actions>
-  </miso>
diff --git a/tests/rsrc/scenes/idyll.xml b/tests/rsrc/scenes/idyll.xml
new file mode 100644
index 000000000..3672b6b66
--- /dev/null
+++ b/tests/rsrc/scenes/idyll.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" standalone="yes"?>
+
+  <miso>
+    <width>22</width>
+    <height>22</height>
+    <base>131072, 131072, 131072, 131072, 131073, 131073, 131073, 131073, 131074, 65537, 65537, 131072, 131074, 131074, 131074, 131074, 131072, 131073, 131074, 131074, 131072, 131074, 131074, 131072, 131072, 131072, 131073, 131073, 131073, 131074, 131072, 65536, 65538, 131072, 131072, 131074, 131072, 131072, 131073, 131074, 131072, 131072, 131072, 131072, 131072, 131074, 131072, 131074, 131072, 131073, 131074, 131073, 131074, 65537, 65536, 131072, 131073, 131072, 131073, 131072, 131074, 131073, 131073, 131073, 131072, 131074, 131073, 131072, 131073, 131074, 131074, 131072, 131074, 131072, 131073, 65536, 65538, 131074, 131074, 131074, 131073, 131073, 131072, 131072, 131073, 131072, 131072, 131072, 131074, 131072, 131074, 131072, 131074, 131074, 131073, 131074, 131074, 65536, 65536, 131073, 131072, 131072, 131074, 131074, 131074, 131073, 131072, 131072, 131074, 131073, 131074, 131073, 131074, 131072, 131073, 131072, 131073, 131073, 131074, 65537, 65538, 131072, 131072, 131072, 131072, 131073, 131072, 131072, 131073, 131074, 131074, 131074, 131073, 131074, 131072, 131073, 131074, 131073, 131072, 131072, 131072, 65536, 65537, 131074, 131073, 131074, 131072, 131074, 131073, 131074, 131073, 131072, 131073, 131072, 131073, 131074, 131074, 131074, 131072, 131074, 131074, 131074, 131072, 65538, 65538, 131074, 131074, 131073, 131073, 131074, 131073, 131073, 131074, 131074, 131072, 131072, 131072, 131073, 131073, 131072, 131072, 131073, 131073, 131074, 131073, 65536, 65537, 65538, 65536, 65537, 65536, 65537, 65537, 65538, 65538, 65536, 131074, 131073, 131073, 131072, 131073, 131074, 131074, 131074, 131073, 131074, 131072, 65536, 65537, 65538, 65536, 65537, 65536, 65538, 65536, 65538, 65537, 65536, 131073, 131073, 131074, 131072, 131074, 131073, 131072, 131074, 131072, 131073, 131072, 65536, 65538, 65536, 65538, 65537, 65538, 65537, 65538, 65536, 65536, 65538, 65538, 131074, 131072, 131074, 131073, 131074, 131074, 131074, 131073, 131074, 131072, 65538, 131073, 131074, 131074, 131072, 131074, 131072, 131074, 131074, 131074, 131072, 131074, 131073, 131073, 131072, 131073, 131072, 131072, 131073, 131073, 131074, 131072, 65537, 131074, 131073, 131073, 131072, 131073, 131072, 131074, 131074, 131073, 131072, 131073, 131072, 131072, 131073, 131074, 131073, 131073, 131074, 65536, 65538, 65538, 65538, 131074, 131073, 131073, 131074, 131073, 131073, 131072, 131073, 131074, 131074, 131072, 131074, 131074, 131073, 131072, 131072, 131074, 131072, 65536, 65538, 65538, 65538, 131073, 131074, 131073, 131074, 131073, 131072, 131073, 131074, 131074, 131073, 131073, 131074, 131072, 131074, 131072, 131073, 131073, 131074, 65536, 65536, 65537, 65537, 131073, 131074, 131073, 131074, 131073, 131072, 131074, 131074, 131073, 131073, 131074, 131074, 131072, 131073, 131073, 131074, 131073, 131074, 65536, 65536, 65537, 65538, 131072, 131073, 131074, 131073, 131073, 131074, 131072, 131074, 131073, 131072, 131074, 131072, 131073, 131073, 131072, 131073, 131073, 131072, 131072, 131072, 65537, 65538, 131074, 131072, 131072, 131072, 131073, 131072, 131072, 131074, 131073, 131074, 131073, 131072, 131073, 131072, 131072, 131072, 131072, 131072, 131073, 131072, 65537, 65536, 131073, 131073, 131074, 131073, 131074, 131074, 131073, 131073, 131072, 131074, 131073, 131074, 131072, 131073, 131073, 131073, 131073, 131072, 131072, 131072, 65537, 65537, 131074, 131074, 131074, 131072, 131073, 131074, 131072, 131074, 131072, 131072, 131074, 131072, 131074, 131074, 131073, 131073, 131073, 131072, 131072, 131074, 131074, 131073, 131073, 131073, 131072, 131072, 131072, 131074, 131074, 131072, 131072, 131074, 131074, 131072, 131074, 131072, 131073, 131074, 131073, 131073, 131072, 131074, 131072, 131073, 131072, 131073, 131073, 131073, 131074, 131074, 131073, 131074, 131073, 131074, 131072, 131074</base>
+    <fringe>0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0</fringe>
+    <object>17, 11, 851968, 16, 14, 589825, 14, 7, 917505, 13, 7, 917505, 8, 15, 1179649, 8, 13, 917505, 7, 10, 655361</object>
+    <actions>, , , , , , </actions>
+  </miso>
diff --git a/tests/rsrc/scenes/wooded.xml b/tests/rsrc/scenes/wooded.xml
new file mode 100644
index 000000000..17f46c1c1
--- /dev/null
+++ b/tests/rsrc/scenes/wooded.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" standalone="yes"?>
+
+  <miso>
+    <width>22</width>
+    <height>22</height>
+    <base>131072, 131073, 131073, 131073, 131074, 131072, 131072, 131072, 131073, 131074, 131074, 131072, 131074, 131074, 131072, 131072, 131073, 131073, 131072, 131073, 131073, 131072, 131074, 131072, 131074, 131074, 131072, 131073, 131074, 131072, 131074, 131074, 131074, 131072, 131074, 131074, 131072, 131074, 131072, 131072, 131073, 131074, 131074, 131072, 131074, 131072, 131072, 131072, 131072, 131074, 131073, 131073, 131074, 131073, 131074, 131073, 131074, 131073, 131074, 131074, 131072, 131072, 131073, 131074, 131074, 131073, 131073, 131073, 131073, 131073, 131072, 131073, 131072, 131072, 131072, 131072, 131072, 131074, 131074, 131073, 131074, 131072, 131074, 131074, 131073, 131074, 131073, 131073, 131072, 131073, 131073, 131072, 131074, 131073, 131073, 131074, 131072, 131072, 131073, 131072, 131072, 131073, 131072, 131072, 131074, 131072, 131072, 131074, 131073, 131072, 131072, 131072, 131074, 131074, 131073, 131073, 131073, 131073, 131074, 131073, 131074, 131072, 131074, 131073, 131073, 131072, 131074, 131073, 131072, 131074, 131073, 131072, 131074, 131074, 131074, 131072, 131074, 131073, 131074, 131072, 131073, 131072, 131072, 131072, 131073, 131074, 131073, 131073, 131072, 131072, 131073, 131072, 131072, 131074, 131074, 131074, 131072, 131074, 131074, 131074, 131074, 131074, 131074, 131072, 131072, 131073, 131074, 131073, 131073, 131073, 131072, 131073, 131073, 131073, 131073, 131074, 131073, 131074, 131072, 131072, 131073, 131073, 131072, 131073, 131074, 131074, 131074, 131074, 131072, 131073, 131074, 131072, 131072, 131072, 131074, 131072, 131073, 131073, 131074, 131072, 131072, 131073, 131073, 131072, 131074, 131072, 131073, 131073, 131073, 131073, 131074, 131073, 131072, 131073, 131072, 131073, 131072, 131073, 131072, 131072, 131074, 131074, 131072, 131073, 131074, 131074, 131073, 131074, 131074, 131072, 131073, 131072, 131072, 131072, 131073, 131073, 131072, 131073, 131072, 131074, 131074, 131074, 131073, 131073, 131073, 131073, 131073, 131073, 131073, 131073, 131074, 131073, 131072, 131072, 131074, 131072, 131074, 131073, 131073, 131074, 131074, 131074, 131074, 131072, 131073, 131073, 131074, 131072, 131072, 131073, 131072, 131074, 131073, 131074, 131072, 131072, 131073, 131073, 131074, 131072, 131073, 131074, 131072, 131073, 131074, 131073, 131072, 131072, 131074, 131072, 131073, 131073, 131072, 131074, 131073, 131072, 131074, 131072, 131074, 131072, 131072, 131074, 131073, 131074, 131074, 131073, 131072, 131074, 131072, 131074, 131073, 131073, 131073, 131073, 131072, 131074, 131073, 131073, 131074, 131073, 131073, 131074, 131074, 131074, 131072, 131073, 131072, 131074, 131072, 131074, 131072, 131072, 131073, 131074, 131073, 131072, 131074, 131073, 131073, 131073, 131074, 131073, 131073, 131072, 131074, 131072, 131072, 131072, 131073, 131074, 131074, 131073, 131072, 131074, 131073, 131074, 131074, 131073, 131074, 131073, 131073, 131072, 131072, 131074, 131073, 131072, 131073, 131074, 131073, 131074, 131073, 131072, 131073, 131073, 131072, 131074, 131072, 131074, 131074, 131072, 131074, 131074, 131072, 131072, 131072, 131073, 131072, 131073, 131072, 131073, 131073, 131074, 131074, 131073, 131074, 131074, 131073, 131074, 131072, 131073, 131072, 131074, 131073, 131073, 131073, 131073, 131073, 131073, 131072, 131073, 131073, 131074, 131073, 131072, 131072, 131074, 131072, 131073, 131072, 131074, 131073, 131073, 131073, 131073, 131073, 131072, 131072, 131072, 131072, 131074, 131072, 131073, 131073, 131073, 131074, 131074, 131072, 131072, 131074, 131073, 131073, 131073, 131072, 131072, 131074, 131073, 131074, 131073, 131074, 131073, 131073, 131073, 131074, 131073, 131074, 131072, 131073, 131072, 131073, 131073, 131074, 131072, 131073, 131072, 131072, 131072, 131074, 131073, 131072, 131072, 131074, 131073, 131072, 131072, 131073, 131073, 131074, 131072, 131074, 131072, 131072, 131074, 131074, 131074</base>
+    <fringe>0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0</fringe>
+    <object>18, 10, 1048577, 18, 13, 655362, 17, 19, 655363, 17, 11, 851968, 16, 14, 1048577, 14, 11, 1048576, 13, 5, 1048577, 13, 17, 851968, 12, 18, 1048576, 12, 22, 655361, 12, 8, 1179648, 11, 13, 786432, 10, 12, 655360, 10, 11, 655362, 9, 7, 1048576, 7, 12, 851968, 6, 15, 655361, 6, 12, 655361, 5, 9, 1179649, 3, 10, 1048576</object>
+    <actions>, , , , , , , , , , , , , , , , , , , </actions>
+  </miso>