MapPointTestFunctional Done

MapPointTestFunctional Done
Merge branch 'zz_local'