- Fix tests that broke during the junit 5 update (#9757)