More unit tests
Update build to use JDK 6