Update stuff
Add tests