Add Gemfile, fix solutions, revise spec wording