Added tested for the two new methods