Core,Tests: use Map instead of Dictionary in hint parser

Core,Tests: use Map instead of Dictionary in hint parser #1818