Update test suite for Java 5.