Moved some old specs into place to actually run (and fixed their failures).
Oops, my 'fix' for downloads that had been canceled was wrong.