Remove redundant Timeout block.
Added timeout test.
Added ICMP changes.