Add new tests
Add more test