review codes && update test case