#3464736: Update and add tests

john.oltmanrequested to merge
issue/registration-3464736:3464736-prep-with-test-updates into 3.3.x

Related to #3464736

Merge request reports