Update tests
Refactoring ...
File transfer part of API call instead of datastream creation
Refactoring
Add and then remove webmock -- doesn't help currently