Fixing conflicts after merging 2427c97
Updating tests to 'share state' across processes by means of tempfiles. This allows after_fork hooks to be tested.
Merge pull request #831 from jonhyman/feature/updated-hooks-merge-to-1-x-stable

Feature/updated hooks merge to 1 x stable