Merge "Add TEST_MAPPING to textclassifier"