Consolidated the ORM entity mock to use the User model mock, adjusted template test to account for reformatting of template