issue #790 done for IdentifyTertiary + tests