Revert "Revert "Add thread""

This reverts commit 9f574922c3e1450160d5f25489566c373856ac90.
Encrease timeout