added timeout mechanism for transactions and integration test