Modify test so as to not introduce a Java 1.7 dependency