#15 Unit test for the diff applied to a map (wip)
#15 Merge of maps (needs jstring 2.7)