converting all specs to expect/allow syntax from should/stub to resolve ...

same as the other pull request, but this one is for master branch.