Fixes for overlapping API calls - File API is passing a bunch more tests.
Merge pull request #20 from purplecabbage/CB-2671

Fixes for overlapping API calls - File API is passing a bunch more tests...