Add more tests cases!