Debugging cleanup, first test passed.