client can be modified
test updated accordingly