Make test code consistent Upstream-commit: 35ef3efe9af64c22c7efbe826f8f63b025639130 Component: engine