Bugfix Client Tests