Refactoring, test IV [r]