diff --git a/test/anthony/raffles_cascade b/test/anthony/raffles_cascade
index 40be00922..d966ca393 100644
--- a/test/anthony/raffles_cascade
+++ b/test/anthony/raffles_cascade
@@ -1,15 +1,15 @@
 arch map
 name raffle
+swap_time 5
+reset_timeout 3600
+fixed_resettime 1
+width 18
+height 18
 msg
 Creator: Anthony Thyssen
 Email: anthony@cit.gu.edu.au
 Date: Tue Dec 22 21:07:40 1998
 endmsg
-x 18
-y 18
-value 5
-weight 3600
-stand_still 1
 end
 arch dwall_2_2_2
 y 1
@@ -853,12 +853,12 @@ end
 arch leather_armour
 name Yoroi of Banzai
 ac 4
-armour 10
 x 12
 y 1
-immune 131072
+resist_death 100
 value 100000
 weight 5000
+armour 10
 end
 arch swall_2_1_2
 x 12
diff --git a/test/faceofdeath b/test/faceofdeath
index 58a9ccfec..c1b951e67 100644
--- a/test/faceofdeath
+++ b/test/faceofdeath
@@ -1,4 +1,7 @@
 arch map
+name <unnamed>
+width 16
+height 16
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
@@ -14,5 +17,5 @@ arch goblin
 name magic immune goblin
 x 8
 y 4
-immune 2
+resist_magic 100
 end
diff --git a/test/python.py b/test/python.py
index b8bdb9673..ee6744b11 100644
--- a/test/python.py
+++ b/test/python.py
@@ -35,6 +35,7 @@ def do_help():
 	whoami.Say(' - light')
 	whoami.Say(' - attacktype')
 	whoami.Say(' - players')
+	whoami.Say(' - checkinv')
 
 def do_arch():
 	archs = Crossfire.GetArchetypes()
@@ -61,7 +62,7 @@ def do_maps():
 	maps = Crossfire.GetMaps()
 	whoami.Say('%d maps loaded'%len(maps))
 	for map in maps:
-		whoami.Say('%s   -> %d players'%(map.Name,map.Players))
+		whoami.Say('%s [%d]   -> %d players'%(map.Name, map.Unique, map.Players))
 #activator=Crossfire.WhoIsActivator()
 	whoami.Say('this map is %s, size %d, %d'%(whoami.Map.Name, whoami.Map.Width, whoami.Map.Height))
 	if (len(topic) > 1):
@@ -146,6 +147,7 @@ def do_resist():
 def do_basics():
 	whoami.Say('Basic test')
 	whoami.Say(' your type is %d'%who.Type)
+	whoami.Say(' your race is %s'%who.Race)
 	whoami.Say(' your level is %d'%who.Level)
 	whoami.Say(' your nrof is %d'%who.Quantity)
 	whoami.Say(' your weight is %d'%who.Weight)
@@ -335,6 +337,17 @@ def do_players():
 	for pl in players:
 		whoami.Say(' - %s'%pl.Name)
 
+def do_checkinv():
+	if len(topic) > 1:
+		what = topic[1]
+	else:
+		what = 'force'
+	find = who.CheckInventory(what)
+	if find:
+		whoami.Say('Found %s in your inventory.'%find.Name)
+	else:
+		whoami.Say('Can\'t find %s in your inventory.'%what)
+
 topic = Crossfire.WhatIsMessage().split()
 #whoami.Say('topic = %s'%topic)
 #whoami.Say('topic[0] = %s'%topic[0])
@@ -396,5 +409,7 @@ elif topic[0] == 'attacktype':
 	do_attacktype()
 elif topic[0] == 'players':
 	do_players()
+elif topic[0] == 'checkinv':
+	do_checkinv()
 else:
 	do_help()
diff --git a/unlinked/Greyshield/Finish b/unlinked/Greyshield/Finish
index c7e314630..461cb5dad 100644
--- a/unlinked/Greyshield/Finish
+++ b/unlinked/Greyshield/Finish
@@ -2406,7 +2406,6 @@ end
 arch holy_shield
 name Greyshield
 msg
-
 The arts that crafted this shield have long
 been lost. The Grey Master's works are but
 a distant shadow of the might contained in
@@ -2419,7 +2418,6 @@ But looking back at the shield, you
 decide that it certainly doesn't emit any
 light. As a matter of fact, it looks as if
 it would absorb light, were that possible...
-
 endmsg
 Dex 3
 Con 3
@@ -2428,6 +2426,11 @@ Cha -3
 ac 8
 x 20
 y 11
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
 material 256
 value 1000
 weight 5000
@@ -2436,7 +2439,6 @@ glow_radius 5
 identified 1
 reflect_missile 1
 reflect_spell 1
-immune 31
 end
 arch teleporter
 hp 7
diff --git a/unlinked/Greyshield/GreyMaster b/unlinked/Greyshield/GreyMaster
index 88a2f1fc4..7a40a948b 100644
--- a/unlinked/Greyshield/GreyMaster
+++ b/unlinked/Greyshield/GreyMaster
@@ -53,10 +53,12 @@ sp 1000
 maxsp 1000
 exp 200000
 y 9
-speed 4.000000
+speed 4.0
 attack_movement 103
+resist_physical 100
+resist_magic 100
+resist_cold 100
 carrying 1
-immune 4127
 arch eye
 name silver ball
 face shell.111
diff --git a/unlinked/Greyshield/Greysword b/unlinked/Greyshield/Greysword
index 6ed92d75c..922064af4 100644
--- a/unlinked/Greyshield/Greysword
+++ b/unlinked/Greyshield/Greysword
@@ -2545,9 +2545,9 @@ Cha -2
 x 17
 y 8
 attacktype 257
+resist_magic 30
 material 256
 magic 5
-protected 2
 end
 arch teleporter
 name teleporter1