Moving things around in blobstore test. 
Gradually remove the use of blobstore.files as it should not be exposed.