Minor progress with test coverage