Test refactoring....