Clean up better from previous unit-test runs Upstream-commit: 79c0c4470f095cf30138dd4b5f19ad737497e9bd Component: engine