A few missed units cases
Fix units for default timeout