improve tests on the engine Upstream-commit: 9e68913397f6fa6aa495480d72b56b5e071ef40b Component: engine