All tests now passing.