Merge "Add TEST_MAPPING for gating and logging"