Simplified Client, improved tests.