#32 - Add more unit test