Fix some filter unit tests. #1558
Tweak insert payment function for better tax. #1744
Improved tax unit tests. #1744 #1558