Remove some of the duplication in ClientTest

Does pretty much what it says on the tin