Merge pull request #23598 from dmatej/junit5

All active tests transformed from JUnit1-4 to Junit5