Some enhancement in integration tests Upstream-commit: ea579a6194525ce3b98eba04f74de19a106bf918 Component: engine