Continue with tests and refactoring of fetcher