Updated syntax and tests according to Morphia spec.
Revert "Updated syntax and tests according to Morphia spec."

This reverts commit 6dbccf2e39925ec0b8b95ce8489976b27b619a8d.
Updated syntax and tests according to Morphia spec.