Update tests to run on Java 7