Fixed the generation of Java Classes.  Working on Unit Tests now.