Don't try to move files that don't exist
Update tests
Update some remaining direct calls to command