Merge "Add TEST_MAPPING config"