improved model test
expanded model tests
Merge branch 'master' of https://github.com/Feralo/website