added more test cases for an new method created as a result of refactoring.

added more test cases for an new method created as a result of refactoring.

added more test cases for an new method created as a result of refactoring.