add timeout test (7) and minor fixed due to timeout mechanism