More test coverage, more tests passing.