Fix bug with auto fetch, add flag to disable it, disable it for tests