Java to Scala translation
Scala syntax fixes
Scala fixes
Scala tests