Cleanup the tests folder
Merge pull request #251 from mbabker/testsFolderCleanup

Cleanup the tests folder