update with latest gems and new spec_helper