remove some redundant map definitions and add a test for heterogeneous map