Unit Tests & Code Refactoring