adjust test and client