More tests... still need to be merged into the Java 6 branch.