Merge Request

Includes
1)Code cleanup and Refactoring for Test cases