For ENG-6482, fix broken JUnit tests.