Clean
Add tests