Modified integration tests again.