Tweak tax unit tests. #1744 #1558