Cleaned up a few tests.  Pulled out TaxLocation abstraction.