Fix tests timeout issue