fix some rspec deprecation warnings

the following have been deprecated:
  expect { ... }.should
  expect { ... }.should_not
Merge pull request #1 from eoin/master

Various improvements