ENG-6672 Resolved Jenkins test failures