Update tests to more recent JUnit

Update tests to more recent JUnit