Clean all the code
Add and Clean Tests
Change some input vals