Merge "Add TEST_MAPPING for backup paths"