Fix remove
Fix test