Tidied up the object being injected into the Fetcher classes
Added some tests