Added a few more unit test