Fix spec issues with edge Spree mail method changes.