diff --git a/blots/scroll.js b/blots/scroll.js
index 870e1a9572..acb8f78db5 100644
--- a/blots/scroll.js
+++ b/blots/scroll.js
@@ -32,8 +32,8 @@ class Scroll extends Parchment.Scroll {
       if (last instanceof CodeBlock) {
         last.deleteAt(last.length() - 1, 1);
       }
-      last.moveChildren(first);
-      last.remove();
+      first.moveChildren(last, last.children.head);
+      first.remove();
     }
     this.optimize();
   }
diff --git a/test/unit/blots/block.js b/test/unit/blots/block.js
index 29827cdb37..4a10e0394a 100644
--- a/test/unit/blots/block.js
+++ b/test/unit/blots/block.js
@@ -49,7 +49,7 @@ describe('Block', function() {
   it('join lines', function() {
     let scroll = this.initialize(Scroll, '<h1>Hello</h1><h2>World!</h2>');
     scroll.deleteAt(5, 1);
-    expect(scroll.domNode).toEqualHTML('<h1>HelloWorld!</h1>');
+    expect(scroll.domNode).toEqualHTML('<h2>HelloWorld!</h2>');
   });
 
   it('join empty lines', function() {
diff --git a/test/unit/core/editor.js b/test/unit/core/editor.js
index 4a54603d31..ca506a587f 100644
--- a/test/unit/core/editor.js
+++ b/test/unit/core/editor.js
@@ -391,6 +391,12 @@ describe('Editor', function() {
       );
       expect(this.container).toEqualHTML('<p>0123</p><h1>56</h1><h2>89</h2>');
     });
+
+    it('code', function() {
+      let editor = this.initialize(Editor, { html: '<p>0</p><pre>1\n23\n</pre><p><br></p>' });
+      editor.applyDelta(new Delta().delete(4).retain(1).delete(2));
+      expect(editor.scroll.domNode.innerHTML).toEqual('<p>2</p>');
+    });
   });
 
   describe('getFormat()', function() {
diff --git a/test/unit/formats/code.js b/test/unit/formats/code.js
index 794ad50f71..e17532a159 100644
--- a/test/unit/formats/code.js
+++ b/test/unit/formats/code.js
@@ -120,15 +120,15 @@ describe('Code', function() {
   it('delete merge before', function() {
     let editor = this.initialize(Editor, { html: '<h1>0123</h1><pre>4567\n</pre>' });
     editor.deleteText(4, 1);
-    expect(editor.getDelta()).toEqual(new Delta().insert('01234567').insert('\n', { header: 1 }));
-    expect(editor.scroll.domNode).toEqualHTML('<h1>01234567\n</h1>');
+    expect(editor.getDelta()).toEqual(new Delta().insert('01234567').insert('\n', { 'code-block': true }));
+    expect(editor.scroll.domNode).toEqualHTML('<pre>01234567\n</pre>');
   });
 
   it('delete merge after', function() {
     let editor = this.initialize(Editor, { html: '<pre>0123\n</pre><h1>4567</h1>' });
     editor.deleteText(4, 1);
-    expect(editor.getDelta()).toEqual(new Delta().insert('01234567').insert('\n', { 'code-block': true }));
-    expect(editor.scroll.domNode).toEqualHTML('<pre>01234567\n</pre>');
+    expect(editor.getDelta()).toEqual(new Delta().insert('01234567').insert('\n', { header: 1 }));
+    expect(editor.scroll.domNode).toEqualHTML('<h1>01234567</h1>');
   });
 
   it('replace', function() {
diff --git a/test/unit/formats/list.js b/test/unit/formats/list.js
index 964246304e..d304309d5a 100644
--- a/test/unit/formats/list.js
+++ b/test/unit/formats/list.js
@@ -189,13 +189,13 @@ describe('List', function() {
       <p>5678</p>`
     );
     editor.deleteText(2, 5);
-    expect(this.container).toEqualHTML('<ol><li>0178</li></ol>');
+    expect(this.container).toEqualHTML('<p>0178</p>');
   });
 
   it('delete partial', function() {
     let editor = this.initialize(Editor, '<p>0123</p><ul><li>5678</li></ul>');
     editor.deleteText(2, 5);
-    expect(this.container).toEqualHTML('<p>0178</p>');
+    expect(this.container).toEqualHTML('<ul><li>0178</li></ul>');
   });
 
   it('nested list replacement', function() {
diff --git a/test/unit/modules/clipboard.js b/test/unit/modules/clipboard.js
index 24181f9843..1eaf0ad76a 100644
--- a/test/unit/modules/clipboard.js
+++ b/test/unit/modules/clipboard.js
@@ -23,7 +23,7 @@ describe('Clipboard', function() {
       this.quill.clipboard.container.innerHTML = '<strong>|</strong>';
       this.quill.clipboard.onPaste(this.event);
       setTimeout(() => {
-        expect(this.quill.root).toEqualHTML('<h1>01<strong>|</strong><em>7</em>8</h1>');
+        expect(this.quill.root).toEqualHTML('<p>01<strong>|</strong><em>7</em>8</p>');
         expect(this.quill.getSelection()).toEqual(new Range(3));
         done();
       }, 2);