More stuff
Add more tests