Merge "Add TEST_MAPPING to overlay test directories" into rvc-dev