Changed 'As a developer...' to 'As a customer...'
Added scenario for item with existing quantity
Split step into two steps
Added test for cart merging
Removed error message to be consistent (per reviewer's suggestion\!)