Added delete and tests