Remove tax calculation from tax, switch instead to using PriceAndTax method