Got evacuate tests working