First-pass update of crm tests
Update class name
Initial changes in response to code review
Updates to tests in response to code review
Add lost project test changes
Merge pull request #724 from caktus/crm-tests

First-pass update of CRM tests