Fix unit tests after last changes