Updated test cases to pass