Added implementation asked to make tests pass