convert rspec should syntax to expect
Merge pull request #576 from adamjonas/master

convert old rspec `should` syntax to `expect`