migration testing
fixed merge conflict with coveralls
Merge pull request #5 from meara/model_tests

migration testing