Added more unit tests