Fixed client tests and removed TODO about timeouts