updated tests
folder reorg
rm DS Store
Merge pull request #1 from MichaelStinson/mike

Mike