ENG-5111: More tests fixed.
Still a few left.