Make tests more tuned to RSpec

Using convenience matchers, subject/let