Adding tests
Merging Map.js