Make fixtures 'future proof'
Merge branch 'develop' into feature/issue-35-fix-directory-url