Fix part of the unit tests