fixing the data type tests, using multivalued maps

Change-Id: Ia833b4de04380d3f24716405a5718ffd54ea31c5
Signed-off-by: Kunal Shroff <shroffk@bnl.gov>