Fix undelivered issue.

Also, fix bad test.