longer timeout needed in tests for client.waitFor?