Add Client Tests