Added helpers and more extensive upsell test.
renamed the upsell test.