Restructure interface around a GDRSMockStub in order to simplify it