Add map data type tests

Change-Id: I24177c1c39cfab362323663553cbc9c7159162c4