Added GetTaxTest, modified classes to Svc format