Katie Russell - 2011-12-12

It might be a good idea to write a test for these cases which don't work but aren't currently used in game by NPCs. It will fail, but then we'll be able to use the test to test the fix.