Fix various integration tests