Jul-15 CMORA - Refactored Entity and related tests. All Tests Pass