updated test and client