Fixing broken unit tests after merge