Update fixtures and data
Merge pull request #206 from eko/2.3-develop

Update fixtures and data