Test refactoring...