Added test for timeout. Looking good.