Fixed the test suite
cleaned up code and removed extranious file
Merge pull request #2 from jeffreybaird/master

Fixing Tests & Cleaning Code