remove debugging and make sure tests pass