Changed method and attribute names in PriceTrait
Cart and Order test fixes
Refactoring fixes