Clean up the tests for the new API changes