[MAP]Fix move elements and add test case for it