As we are using rspec new version we can use then expect in all our rspec test cases.
As for better rspec http://betterspecs.org/#expect.
If it is acceptable then I will proceed to change others
cc @BanzaiMan @headius
Indentation seems off here.
The commit subject should be fixed.
use expect instead of should for better rspec
Thank you @BanzaiMan