Added .DS_Store to .gitignore
Restructured matcher tests
Removed unused actual and expected variables