First set fo unit tests
Refactorings