refactoring 'move' tests according to Dominic's notes