Fix tests to reflect changes to move method arguments