Cleaning up these tests