Updated test to reflect refactoring