Replaced should with expect on all model tests.
Merge pull request #19 from cloudspace/63311776_test_syntax_upgrade

Replaced should with expect on all model tests.