Fixup of java vs scala projects
Fix test compile errors
1.5.0
1.6.0-SNAPSHOT