Timeout problem is fixed, need to test multiple flows