Improve the Move tests