Make testing helpers as such… Upstream-commit: ba02880786b9924f251ea0785de168f45996e325 Component: engine