More test coverage improvements