Don't use Java 7 api.
Some int test fixes due to Groovy upgrade.