Update test-and-docs with TESTDIRS Upstream-commit: 0339ed787c4e7795ad8b3f6d3a230ba8dcec4d48 Component: engine