Clean project
Add tests