Clean test and improve add and delete method