Fixed tests to runter with JDK8