Is this the only place we were implementing the interface explicitly? If that's not the case, could you also fix those to favor the testability?