Added new Java generators and tests