apply review and add testcase