simplifying testing stuff
Merge pull request #1 from justinclayton/master

simplifying testing stuff