Fix unit tests after change 249