Add more unit test