improve usability of test client