Added handlers and tests for timeout situations