Fixed regression in the unitests