Partial Refactor

Partial refactor to more decorator model
Test method name change

Change test method names in TerminalTest
Move calculate to cart item

Move calculate to cart item
Start moving to decorator