Issue #3575480: Fix test failures.

Adam Nagyrequested to merge
issue/maxlength-3575480:3575480-d11.3-fix-test into 3.x

Closes #3575480

Merge request reports