Images are correctly moved to subdirectories in the completed directory, with tests