Add extra test. Make some changes