Fixing jdk 8 test failure
Improved logging.