Merge "Add more fine-grained testing for Transactions"