Fix potential tax calculation issues with charging of unreturned expedited exchanges

* Test that taxes are included
* Make sure to hit all state machine transition events