Merge "Transaction_test refactoring continued"