Merge "Add/Remove testcase"