Gardening M37 : Fix some failures in unittests.

The interface of the base class changed so we need to adapt
our test also.