Test on JDK 8
Fix for JDK 7