Consolidate test models and fixtures
Remove debug print statements
Merge pull request #116 from cbmi/issue-112

Consolidate test fixtures and models