renamed expectations to assertions
Merge remote-tracking branch 'origin/master'