For ENG-5256, fix the tests that are no inordinately painful to fix