use pending and fix unnecessary skips
Merge pull request #749 from zendesk/grosser/pending

use pending and fix unnecessary skips