Updates to some Java code generator tests