Fix more API tests