Add more tests
Done