Tweaked tests to cater for the fact that clients have a uuid for an id rather than an integer