D-15729 test changes after code review