Refactored with shoulda matchers