more modular testing
Merge pull request #29 from musikata/betterTesting

more modular testing