Fix self invoking function
Fix Tests with async file fetcher