updated test and fixed client issues