Updated TestClient

Tested and working with Mono.