More test coverage improvements.