Added suggestions from issue #35 to make TestMapMove APIs less confusing and to improve code style