Migrate expects to v0.4
Merge pull request #39 from jaimegildesagredo/new-expects

Migrate expects to v0.4