fix-tests-with-java9
