got rid of all JDK7 dependencies in tests