Lots of new better nicer tests, and a few tweaks based on failed tests.
Changed the example web service to use the convenience method