adds should matchers and reorganizes gemfile