Tax fixes in unit test