Clean up and fix failing test.