ENG-4682: More random test improvements.