Added some fixtures
Merge branch 'dev'