Fix failing tests on master.
Merge pull request #648 from alphagov/bugfix/fix-failing-master

Fix failing tests on master.