Clean up test constants
Handle out-of-order transactions