Fixed tests after merge went wrong.