Updates to the Gemfile and Guardfile and some location test updates