Added shoulda-matchers gem and refactored rspec tests