CAL-684 add unit test for remove