EDREI-11753: Changes after code review (test).