Passing Junits for map loading
Merge conflicts in map