model tests
Merge branch 'tests'
add .swp to gitignore