Java8 features have been removed so that Java7 is adequate. All tests now pass.