Tweaked client test lib setup.