added answer model tests
Merge branch 'master' into answers