For ENG-5498, suppress shutdown errors, fix test cases