US44-Refactoring Code

changed Unit tests