Isn't there a way to foce the tx completion notifications to be synchronous so that we don't have to add this code for unit testing? It makes our testsuite more predictable.