Refactoring and increase timeout to 120s