Fix unit tests which failed after last commit