improve and refactor models specs
Merge pull request #60 from folieadrien/refactor-specs

improve and refactor models specs