Refactor baseclient tests