added some testing orginization
Merge pull request #17 from matthewclower/master

added some testing orginization