Upgrade test to JDK 1.7