Added timeout to named args, updated tests