Make Client instance not critically dependent on the 'server' property (allow testing fake requests in lib using server-kit) (improvements over the previous version)