Refactoring
Add Junit test cases
unit test case added