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

....