test updates
Prevent merge conflicts

Merge branch 'master' into models_testing
Merge pull request #110 from cdcueva/models_testing

Models testing