Fixed up integration tests.