Add more tests and fix existing tests
Add more tests and fix existing tests