Fix remove_command and test it