Fix for invalid error messages.
fixing tests to use new messages
Merge pull request #472 from ministryofjustice/invalid_error_messages

Fix for invalid error messages.