Update fixtures and requirements
merge
merge