Merge pull request #3077 from adamwight/test_fixtures