Minor refactoring.
Added delete key tests.