Improvement of integration tests