Added two unit tests