Cleaner code
First tests