Merge "Refactoring Transaction_test continued"