Fix more integration tests