refactored test fixtures

this simplifies the fixture setup some. A lot less repetition now.