Re-org tests a bit, mostly collapsing listeners into transactions_test