Be less stupid
Add Tests