PIM-1104: Update scenario for click and create