For ENG-6702, fix test issues caused by new assertions