Some fixes, extending tests for DeletionAnnotationBuilder.