client test and bug fix