Updating spec with changes for isValid
Merge branch 'no_zero_timeout'