Beginning to improve test coverage