FetcherRetest: Replace large nested test structs, with simple functions