Use NCollection_Map instead of instantiation of TCollection_Map Test-cases for issue #25344 Correct error in test script: the shape variable assigned by the command 'restore' must not be referred by '$'.