Fix broken tests since FileOrganiser update