Remove .swp files
Add *.swp to .gitignore
Correction of mocking in testing.