Update rspec to expect syntax, plus == to eq
Merge pull request #2681 from durrantm/rspec_expect_syntax

Update rspec to expect syntax, plus == to eq