TestConceptMap improvements