Fix test_remove