organize test fixtures more
Merge pull request #154 from twbs/organize-fixtures

organize test fixtures more