Add upload spec, fix Upload#url method

Upload#url is now just delegated to its asset;
hopefully it won't break anything