Updated models and tests
Merge pull request #53 from jcarlosgarcia/issue-42

Updated models and tests