Remove some of the duplication in ClientTest
Merge pull request #68 from DaMouse404/client-test-duplication

Remove some of the duplication in ClientTest