Cleaned up names of tests and data files
Merge pull request #27 from jayfo/cleanup

Cleaned up names of tests and data files