Add .DS_Store to .gitignore.
Small test suite cleanup
Merge conflict fix