Improved stability of test client and better output