More gemfile and testing updates