Refactor Fetch class, add tests and fixtures