Attempt to increase code coverage with more tests and refactoring.