Add missing fixtures
Merge branch 'clobber' into hotfix