Switch to the new RSpec syntax

Switches to new RSpec syntax, and improves readability/wording of some specs. Also removes some unnecessary duplication of specs.