Require rspec 'expect' syntax, and fix a couple tests that still used 'should' (see #24)