Added delete tests.
Small changes/improvements.