Rename test files for file name conflicts
Merge pull request #183 from defunkt/rename-test

Rename test files for file name conflicts