Fixed tests after merge.