tests working on this branch also
added simplecov - 90% coverage of models and 70% total coverage
100% test coverage on models
Merge conflict fixes.