Merge user and customer tests. #2256
Add an item to the cart while testing fees to account for the changes introduced in #2528