Broke tests down into smaller sections to make it more obvious which tests are failing
Merge pull request #7 from AlasdairSwan/master

Broke tests down into smaller sections