made testclient a bit more usable again