More thorough tax tests. #1558 #1744