Merge "Revert "Add TEST_MAPPING""