Rearrange tests for some organizational sanity
Merge pull request #61 from gjtorikian/rearrange-fixtures

Rearrange tests for some organizational sanity