Non-blocking observation:  Since the tests would pass if it failed to execute only because of lock contention, would it make sense to increase the wait a little bit?  Maybe just 2 or 3.  I haven't run these a lot though, so maybe this is fine.

(at a future point when we have the audit logging, we can probably just check for the transaction id failure in the audit log)