Fix unit tests after 66818ea