Added two more unit tests