Add proper fixtures
Merge pull request #37 from galileo/feature-fix-fixtures

Add proper fixtures