Better specs; upload: false is now passed as an argument