Fixes tests and price shit on delivery
Merge pull request #299 from Tmee/delivery

Fixes tests and price shit on delivery