improve-coverage

Mission to improve test coverage...