Fixed regression in unit tests