get_categorized_entities helper fixed
More extra entites for test
get_categorized_entities correctly tested
Changes updated