Improving integration tests.