updated Gemfile and fixed one unit test by adding a 'restrict_to' call in the beginning
merged with master