Refactor all should to expect
Merge pull request #25 from teamteam/expect

Refactor all should to expect