Add validations and tests to the models
Merge branch 'dev'
Merge branch 'master' into dev