Add some more tests
Some more tests
Fix