Improving integration tests