Merged pull request from adrianagm.
Merge branch 'adrianagm-master'
Minor fix in marker layer so we use this.getMap() instead of global map and test change.