Added testing for marker locations
Merge conflicts resolved