OZP-421 : Converted all code under domain to Java, need to convert tests...