Fix tests, upgrade JUnit, edit compiler flag to 1.7.