Added timeout testing