Cleaning up some tests