changed tests to run java 1.6-1.7.
Merge remote-tracking branch 'origin/master'