cart feature specs
Refactored cart feature spec
Fixed merge conflicts