Gemfile update and some tests