Add TaxStandard and remove unit test