Updated expression to accept a thisObject. Set new unit test for map.