Fix integration tests

This only fixes errors, not failures.