Upgrade some tests to juni4 that got missed the first time.
Switch to gradle wrapper so gradle installation is not necessary.