Tax testing now much more complete. Should be ready for merge.