Fix failing tests, upgrade to should 4.0
"Merge pull request #1231 from mjackson/fix-failing-tests\n\nFix failing tests, upgrade to should 4.0"

* mjackson/fix-failing-tests:
  Fix failing tests, upgrade to should 4.0
Fix should dependency (#1231)