make test/mock server and client a little friendlier for Lakshmi's use