Updated the unit tests
Set java version to 1.6 for more compatibility with deployments