Add the MoveFile test
(and improve other test util)