Add more tests cases