Updated test cases to reflect refactoring