Some adjustments to deletion annotation tests.