Fixed a bunch of integration tests.