Clean up, all tests pass