Fix tax included/excluded on expense, add unittests