Merge "Transfer Request - refactoring and new test cases"