Updated test cases to reflect recent API changes