More test coverage...