TW-38437 reduced timeout and added logging