Added model tests
Refactored names of sample models