Fix up acceptance tests for upsell.

LMS-1127