Adjust and add test case.