Update test projects to use Java 6