Clean up the tests. #99