Fix the add
Add more tests