Merge pull request #3221 from strangelookingnerd/migrate_to_junit5

Migrate tests to JUnit5