Move testing to use Java 1.6