Allow direct specification of port. Fix client test. Server shim ACL enforcement is a little suspect.