small fixes + some code simplification for taxes test fixture