(PE-3680) Fixup failing tests due to missed rebase on merge of PE-3673

A pull request pertaining to work on PE-3673 was merged without first
rebasing based on conflicting changes from a pull request merged for
PE-3266.  This commit fixes up the failing tests to address the
conflict.