Fix unit tests after merge from MT