Fixed bugs that had broken cucumber tests since last spree update