fix for more test failures related to JDK issues