Merge pull request #9 from thegoleffect/master

Test Suite Organization
fix for #8