added test for new map/combine functionality