use expect tinstead of should in rspec

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

Thanks