Added more unit tests
Added more unit tests