ENG-4515: Fix broken test and take some pmartel feedback.