diff --git a/tests/rsrc/bundles/components/actions.xml b/tests/rsrc/bundles/components/actions.xml
index 6bc5adbc4..f18e5826d 100644
--- a/tests/rsrc/bundles/components/actions.xml
+++ b/tests/rsrc/bundles/components/actions.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" standalone="yes"?>
-<!-- $Id: actions.xml,v 1.4 2002/02/19 22:10:30 mdb Exp $ -->
+<!-- $Id: actions.xml,v 1.5 2002/03/05 07:09:59 mdb Exp $ -->
 
 <!-- test component action definitions -->
 <actions>
   <action name="standing">
-    <framesPerSecond>8</framesPerSecond>
-    <origin>43,106</origin>
+    <framesPerSecond>5</framesPerSecond>
+    <origin>50,112</origin>
     <tileset>
-      <heights>124, 124, 124, 124, 124, 124, 124, 124</heights>
-      <widths>94, 94, 94, 94, 94, 94, 94, 94</widths>
+      <heights>160, 160, 160, 160, 160, 160, 160, 160</heights>
+      <widths>100, 100, 100, 100, 100, 100, 100, 100</widths>
       <tileCounts>1, 1, 1, 1, 1, 1, 1, 1</tileCounts>
       <offsetPos>0, 0</offsetPos>
       <gapSize>0, 0</gapSize>
@@ -16,11 +16,11 @@
   </action>
 
   <action name="walking">
-    <framesPerSecond>8</framesPerSecond>
-    <origin>43,106</origin>
+    <framesPerSecond>5</framesPerSecond>
+    <origin>50,112</origin>
     <tileset>
-      <heights>124, 124, 124, 124, 124, 124, 124, 124</heights>
-      <widths>94, 94, 94, 94, 94, 94, 94, 94</widths>
+      <heights>160, 160, 160, 160, 160, 160, 160, 160</heights>
+      <widths>100, 100, 100, 100, 100, 100, 100, 100</widths>
       <tileCounts>6, 6, 6, 6, 6, 6, 6, 6</tileCounts>
       <offsetPos>0, 0</offsetPos>
       <gapSize>0, 0</gapSize>
diff --git a/tests/rsrc/bundles/components/classes.xml b/tests/rsrc/bundles/components/classes.xml
index a79e72b7f..978a76438 100644
--- a/tests/rsrc/bundles/components/classes.xml
+++ b/tests/rsrc/bundles/components/classes.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" standalone="yes"?>
-<!-- $Id: classes.xml,v 1.4 2002/02/19 22:10:30 mdb Exp $ -->
+<!-- $Id: classes.xml,v 1.5 2002/03/05 07:09:59 mdb Exp $ -->
 
 <!-- test component class definitions -->
 <classes>
   <!-- character component classes -->
-  <class name="legs" renderPriority="1"/>
   <class name="feet" renderPriority="0"/>
-  <class name="hands" renderPriority="2"/>
+  <class name="legs" renderPriority="1"/>
+  <class name="hand_left" renderPriority="2"/>
+  <class name="hand_right" renderPriority="2"/>
   <class name="torso" renderPriority="3"/>
   <class name="head" renderPriority="4"/>
-  <class name="hair" renderPriority="5"/>
-  <class name="hat" renderPriority="6"/>
+  <class name="eyepatch" renderPriority="5"/>
+  <class name="hair" renderPriority="6"/>
+  <class name="hat" renderPriority="7"/>
+  <class name="familiars" renderPriority="8"/>
 
   <!-- vessel classes -->
   <class name="navsail" renderPriority="0"/>
diff --git a/tests/rsrc/bundles/components/pirate/male/eyepatch/blackpatch/standing.png b/tests/rsrc/bundles/components/pirate/male/eyepatch/blackpatch/standing.png
new file mode 100644
index 000000000..610896d53
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/eyepatch/blackpatch/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/eyepatch/blackpatch/walking.png b/tests/rsrc/bundles/components/pirate/male/eyepatch/blackpatch/walking.png
new file mode 100644
index 000000000..4f01e5cdc
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/eyepatch/blackpatch/walking.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/feet/barefoot/standing.png b/tests/rsrc/bundles/components/pirate/male/feet/barefoot/standing.png
new file mode 100644
index 000000000..def55249e
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/feet/barefoot/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/feet/barefoot/walking.png b/tests/rsrc/bundles/components/pirate/male/feet/barefoot/walking.png
new file mode 100644
index 000000000..b2b59dc67
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/feet/barefoot/walking.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/feet/boots/standing.png b/tests/rsrc/bundles/components/pirate/male/feet/boots/standing.png
new file mode 100644
index 000000000..bbca2d62a
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/feet/boots/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/feet/boots/walking.png b/tests/rsrc/bundles/components/pirate/male/feet/boots/walking.png
new file mode 100644
index 000000000..d70520fde
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/feet/boots/walking.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/feet/pegleg_barefoot/standing.png b/tests/rsrc/bundles/components/pirate/male/feet/pegleg_barefoot/standing.png
new file mode 100644
index 000000000..129e8dd61
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/feet/pegleg_barefoot/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/feet/pegleg_barefoot/walking.png b/tests/rsrc/bundles/components/pirate/male/feet/pegleg_barefoot/walking.png
new file mode 100644
index 000000000..26fc27e65
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/feet/pegleg_barefoot/walking.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/feet/pegleg_boots/standing.png b/tests/rsrc/bundles/components/pirate/male/feet/pegleg_boots/standing.png
new file mode 100644
index 000000000..b80867b84
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/feet/pegleg_boots/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/feet/pegleg_boots/walking.png b/tests/rsrc/bundles/components/pirate/male/feet/pegleg_boots/walking.png
new file mode 100644
index 000000000..b81d6680e
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/feet/pegleg_boots/walking.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/feet/regular/standing.png b/tests/rsrc/bundles/components/pirate/male/feet/regular/standing.png
deleted file mode 100755
index 26add6d73..000000000
Binary files a/tests/rsrc/bundles/components/pirate/male/feet/regular/standing.png and /dev/null differ
diff --git a/tests/rsrc/bundles/components/pirate/male/feet/regular/walking.png b/tests/rsrc/bundles/components/pirate/male/feet/regular/walking.png
deleted file mode 100755
index 7c9d97490..000000000
Binary files a/tests/rsrc/bundles/components/pirate/male/feet/regular/walking.png and /dev/null differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hair/ponytail/standing.png b/tests/rsrc/bundles/components/pirate/male/hair/ponytail/standing.png
new file mode 100644
index 000000000..5f6bd868c
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/hair/ponytail/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hair/ponytail/walking.png b/tests/rsrc/bundles/components/pirate/male/hair/ponytail/walking.png
new file mode 100644
index 000000000..0beb82c37
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/hair/ponytail/walking.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hair/princevaliant/standing.png b/tests/rsrc/bundles/components/pirate/male/hair/princevaliant/standing.png
new file mode 100644
index 000000000..f03651f19
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/hair/princevaliant/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hair/princevaliant/walking.png b/tests/rsrc/bundles/components/pirate/male/hair/princevaliant/walking.png
new file mode 100644
index 000000000..99beb749e
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/hair/princevaliant/walking.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hair/regular/standing.png b/tests/rsrc/bundles/components/pirate/male/hair/regular/standing.png
deleted file mode 100755
index 1eca0b04e..000000000
Binary files a/tests/rsrc/bundles/components/pirate/male/hair/regular/standing.png and /dev/null differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hair/regular/walking.png b/tests/rsrc/bundles/components/pirate/male/hair/regular/walking.png
deleted file mode 100755
index 4b096047f..000000000
Binary files a/tests/rsrc/bundles/components/pirate/male/hair/regular/walking.png and /dev/null differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hand_left/barehand/standing.png b/tests/rsrc/bundles/components/pirate/male/hand_left/barehand/standing.png
new file mode 100644
index 000000000..d0a31d2ac
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/hand_left/barehand/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hand_left/barehand/walking.png b/tests/rsrc/bundles/components/pirate/male/hand_left/barehand/walking.png
new file mode 100644
index 000000000..ab8558b6d
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/hand_left/barehand/walking.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hand_left/hook/standing.png b/tests/rsrc/bundles/components/pirate/male/hand_left/hook/standing.png
new file mode 100644
index 000000000..6984baa08
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/hand_left/hook/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hand_left/hook/walking.png b/tests/rsrc/bundles/components/pirate/male/hand_left/hook/walking.png
new file mode 100644
index 000000000..05c6a701d
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/hand_left/hook/walking.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hand_right/barehand/standing.png b/tests/rsrc/bundles/components/pirate/male/hand_right/barehand/standing.png
new file mode 100644
index 000000000..e1ffd3da7
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/hand_right/barehand/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hand_right/barehand/walking.png b/tests/rsrc/bundles/components/pirate/male/hand_right/barehand/walking.png
new file mode 100644
index 000000000..7043d70b6
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/hand_right/barehand/walking.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hat/bandana/standing.png b/tests/rsrc/bundles/components/pirate/male/hat/bandana/standing.png
new file mode 100644
index 000000000..3784253f2
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/hat/bandana/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hat/bandana/walking.png b/tests/rsrc/bundles/components/pirate/male/hat/bandana/walking.png
new file mode 100644
index 000000000..e9497999c
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/hat/bandana/walking.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hat/captains/standing.png b/tests/rsrc/bundles/components/pirate/male/hat/captains/standing.png
new file mode 100644
index 000000000..d8eabccb5
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/hat/captains/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hat/captains/walking.png b/tests/rsrc/bundles/components/pirate/male/hat/captains/walking.png
new file mode 100644
index 000000000..0047dd06a
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/hat/captains/walking.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hat/regular/standing.png b/tests/rsrc/bundles/components/pirate/male/hat/regular/standing.png
deleted file mode 100755
index bcdcfeed4..000000000
Binary files a/tests/rsrc/bundles/components/pirate/male/hat/regular/standing.png and /dev/null differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hat/regular/walking.png b/tests/rsrc/bundles/components/pirate/male/hat/regular/walking.png
deleted file mode 100755
index ab36967c9..000000000
Binary files a/tests/rsrc/bundles/components/pirate/male/hat/regular/walking.png and /dev/null differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hat/sleepinghat/standing.png b/tests/rsrc/bundles/components/pirate/male/hat/sleepinghat/standing.png
new file mode 100644
index 000000000..2b7467205
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/hat/sleepinghat/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/hat/sleepinghat/walking.png b/tests/rsrc/bundles/components/pirate/male/hat/sleepinghat/walking.png
new file mode 100644
index 000000000..1377d78fc
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/hat/sleepinghat/walking.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/head/bald/standing.png b/tests/rsrc/bundles/components/pirate/male/head/bald/standing.png
new file mode 100644
index 000000000..2fc310439
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/head/bald/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/head/bald/walking.png b/tests/rsrc/bundles/components/pirate/male/head/bald/walking.png
new file mode 100644
index 000000000..1647e9f25
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/head/bald/walking.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/head/goatee/standing.png b/tests/rsrc/bundles/components/pirate/male/head/goatee/standing.png
new file mode 100644
index 000000000..8995c6b52
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/head/goatee/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/head/goatee/walking.png b/tests/rsrc/bundles/components/pirate/male/head/goatee/walking.png
new file mode 100644
index 000000000..e779cce4a
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/head/goatee/walking.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/head/regular/standing.png b/tests/rsrc/bundles/components/pirate/male/head/regular/standing.png
deleted file mode 100755
index 1f5f5fd09..000000000
Binary files a/tests/rsrc/bundles/components/pirate/male/head/regular/standing.png and /dev/null differ
diff --git a/tests/rsrc/bundles/components/pirate/male/head/regular/walking.png b/tests/rsrc/bundles/components/pirate/male/head/regular/walking.png
deleted file mode 100755
index 9af5c1cd3..000000000
Binary files a/tests/rsrc/bundles/components/pirate/male/head/regular/walking.png and /dev/null differ
diff --git a/tests/rsrc/bundles/components/pirate/male/head/shortbeard/standing.png b/tests/rsrc/bundles/components/pirate/male/head/shortbeard/standing.png
new file mode 100644
index 000000000..7c68b33ec
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/head/shortbeard/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/head/shortbeard/walking.png b/tests/rsrc/bundles/components/pirate/male/head/shortbeard/walking.png
new file mode 100644
index 000000000..bbaf847a9
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/head/shortbeard/walking.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/legs/pants/standing.png b/tests/rsrc/bundles/components/pirate/male/legs/pants/standing.png
new file mode 100644
index 000000000..bc1c00a2b
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/legs/pants/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/legs/pants/walking.png b/tests/rsrc/bundles/components/pirate/male/legs/pants/walking.png
new file mode 100644
index 000000000..614acb9ff
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/legs/pants/walking.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/legs/regular/standing.png b/tests/rsrc/bundles/components/pirate/male/legs/regular/standing.png
deleted file mode 100755
index 62367bf85..000000000
Binary files a/tests/rsrc/bundles/components/pirate/male/legs/regular/standing.png and /dev/null differ
diff --git a/tests/rsrc/bundles/components/pirate/male/legs/regular/walking.png b/tests/rsrc/bundles/components/pirate/male/legs/regular/walking.png
deleted file mode 100755
index 4fe636d76..000000000
Binary files a/tests/rsrc/bundles/components/pirate/male/legs/regular/walking.png and /dev/null differ
diff --git a/tests/rsrc/bundles/components/pirate/male/legs/stripeyknickers/standing.png b/tests/rsrc/bundles/components/pirate/male/legs/stripeyknickers/standing.png
new file mode 100644
index 000000000..bd10ef905
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/legs/stripeyknickers/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/legs/stripeyknickers/walking.png b/tests/rsrc/bundles/components/pirate/male/legs/stripeyknickers/walking.png
new file mode 100644
index 000000000..d11ff86be
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/legs/stripeyknickers/walking.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/torso/regular/standing.png b/tests/rsrc/bundles/components/pirate/male/torso/regular/standing.png
deleted file mode 100755
index 71d6b87a4..000000000
Binary files a/tests/rsrc/bundles/components/pirate/male/torso/regular/standing.png and /dev/null differ
diff --git a/tests/rsrc/bundles/components/pirate/male/torso/regular/walking.png b/tests/rsrc/bundles/components/pirate/male/torso/regular/walking.png
deleted file mode 100755
index d5c10c1dc..000000000
Binary files a/tests/rsrc/bundles/components/pirate/male/torso/regular/walking.png and /dev/null differ
diff --git a/tests/rsrc/bundles/components/pirate/male/torso/shirt_sash/standing.png b/tests/rsrc/bundles/components/pirate/male/torso/shirt_sash/standing.png
new file mode 100644
index 000000000..e18243959
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/torso/shirt_sash/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/torso/shirt_sash/walking.png b/tests/rsrc/bundles/components/pirate/male/torso/shirt_sash/walking.png
new file mode 100644
index 000000000..40674d811
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/torso/shirt_sash/walking.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/torso/vest_stripedshirt_belt/standing.png b/tests/rsrc/bundles/components/pirate/male/torso/vest_stripedshirt_belt/standing.png
new file mode 100644
index 000000000..fa27c3931
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/torso/vest_stripedshirt_belt/standing.png differ
diff --git a/tests/rsrc/bundles/components/pirate/male/torso/vest_stripedshirt_belt/walking.png b/tests/rsrc/bundles/components/pirate/male/torso/vest_stripedshirt_belt/walking.png
new file mode 100644
index 000000000..8ae37bc3e
Binary files /dev/null and b/tests/rsrc/bundles/components/pirate/male/torso/vest_stripedshirt_belt/walking.png differ