Improvement in integration tests Upstream-commit: 3af9b1d395615882dc64df68878139fd5e68712c Component: engine