cleaned up, fixed test scripts
Merge pull request #51 from dlazell/mybranch

cleaned up, fixed test scripts