Add removal listener to test cases