Force Java 1.6 and small fix to get tests to run on buildserver