Merge "Get rid of JUnit 5 dependency"