Fixed tests after merge