Added test files.
Merged changes to .gitignore from master.