Test improvements to reduce time for long running tests Upstream-commit: 73c597e5f216e84e5c0d7738c20c4134b225901b Component: engine