Got the tests passing.