Added delete tests and fixes