Updated map unit tests to latest changes
Merge branch 'develop' of https://github.com/castro12321/Plevian into develop