Added more unit tests#