Fixed test suite bugs and added more exc/inc tax elements.