test refactoring, improvements in code coverage