Add client testsuite stuff