Move client into testing namespace