Added timeout default and test