Broke tests down into smaller sections

Broke tests down into smaller sections to make it more obvious which tests are failing