Improve Client class testing...faking and counting