Finish 4.11.14
Unit tests update for tax calculation
Finish 4.11.15