MEDIUM / Fixed regression in unit tests