XX-10939 Review changes. Tests