Client tests bugfix