Fix some test cases that started to fail on recent Java versions
3 files changed