Rspec 3

Upgrade rspec to 3 with new expectation syntax.