ENG-5065: fix broken junit tests.