Clean code
Add Tst