Some refactoring to Client
Improvements to TestDriver