Starting to improve test coverage