Added some really useful zombie tests! :)