Added more unit test