misc. updates to .java tests