Fixed tests after cuvol entry move