Update should and fix tests

All tests pass with latest version of should.