ENG-6854: Squash. Test fixups.