fix delete & tests