ENG-4880: test tweaks from pmartel feedback.