Done with all basic refactors of FetcherRetest: look at struct naming
next.