Fix JUnit 5 related compile issues
2 files changed