For ENG-6247, fix a few test blocking bugs