updating tests to use testSuite and testSet
Merge pull request #103 from matthewclower/master

updating tests to use testSuite and testSet