Test refactored.