added tests for this refactoring project