Fixing tests, better error handling

Trying to apply the same standards we've used elsewhere, no reason. I should of included the service URL instead of having these separate.