ENG-4825: Fix test that made bad choices but doesn't have to live with them.