baseclient fixes & tests