Code clean-up
Increase timeout for tests running with tracing enabled