TEST AND REFACTORING CHANGES