Feature/consolidate fixtures

Piggybacking on @adelevie's work with #173 and also moving test/fixtures into spec/fixtures.