Add timeout to cpdir
Test for step.timeout instead of a fixed amount.