Make test-suite client cmd -t<timeout> actually work