Use more descriptive assertions
Merge pull request #1253 from matthewd/select-empty

Use more descriptive assertions