Several changes in model structure and new tests
More tests
Merge pull request #2 from lomefin/model_tests

Model tests