Fix bugs on Test Clients