Fixed Zombie tests