[MM,PS,MS] - Fixed map, added map feautures, fixed test cases