Added Unit Tests tool; Refactoring;