Fix test
Fix removal