Add more tests

Just define the implementation a little.
Merge pull request #634 from alphagov/add-more-url-formatting-tests

Add test which includes &