Fix Test
Fix Client Class