CORE-3509 Fixed tests for delete changes.