Updated syntax and tests according to Morphia spec.