unit test coverage of refactored classes