Adding test cases for Redeem module
Resolving conflicts in testng.xlm