Make fixtures 'future proof'
Merge branch 'develop' into feature/issue-33-update-admin-title