tests pass with jdk5 changes