Refactoring
First tests