For ENG-5079, fix a few test issues