fixing two unit tests