Fix (some) tests.
Fix tests but killing zombies.