Fix the tests timeout issue