Some API test cleanup