Unit test additions and changes
Merge branch 'MapBranch'