Fix broken integration tests