Cleaning up tests closed #1