Cleaning up for testing