Some more fixes to API calls and test code