Add Unit Test + Refactoring