Fix unit tests after last commit