Tests are now passing.