Fix tests, and remove 'unwanted' one.

The removed test exposes a bug we have chosen to ignore for now
related to uploading multiple attachments at the same time as
creating the attachable.  This functionality is earmarked for
re-building anyway, so we're not going to spend the time fixing
the existing code.