#80 Add more unit test