Add a test for #kill_unicorn + small cleanup for existing tests