clean up and update test case