Consistently use "should" in feature assertions
Merge branch 'should'