Clarified tests a bit
Update tests
Add some more tests