More refactoring and code coverage improvements