Bring TESTDIRS back for unit-tests Upstream-commit: f962c0715f153b806742cefaa6e9c9adf4e25273 Component: engine