Fix for issue 4839

Fixed so that changing address to a non-taxable zone now reverts the applied tax. 

can we use `expect` instead of `should` here?