Merge "Add TEST_MAPPING for utils classes."