More integration tests.

Conflicts:
	app/models/spree/promotion/actions/give_store_credit.rb