Add Fixtures
Merge branch 'feature-fixtures'