Remove copied tests
Fix JDK8 build