Fix the test cases that were messed up from the API changes