reverting update of shoulda gem due to rspec bug