Fix fetch_sets call
Update FileFetchers
Fix unit tests