Fixes tax calculation for product quantities of more than one
Fixes calling decorator methods to allow changing behaviour by decorators