Added more unit tests
Added unit tests