cleaned-up spec helpers and Gemfile