[Added] Junit Tests
[Refactoring]