Start testing the getter functions
Adapt to new fetcher code