Fix fixtures
Merge remote branch 'upstream/master'
Fix features and refactore them to reduce duplication