Complete and add extra test