Trying to fix a persistent indentation error
small refinement to test timeouts.  Also, the client test wasn't allowing enough time for the test to do its work, so was always failing.