updated client module and test