Added setting for default timeout;
Added default timeout to junit if it doesn't already exist;