Let's use the getters instead
Simplify MockRestClient and use more mockito instead