Index: /CKEditor/tests/tt/4574/1.html
===================================================================
--- /CKEditor/tests/tt/4574/1.html	(revision 4808)
+++ /CKEditor/tests/tt/4574/1.html	(revision 4809)
@@ -12,4 +12,13 @@
 			assert = CKEDITOR.test.assert,
 			test = CKEDITOR.test;
+
+	function standardize( html )
+	{
+		var writer = new CKEDITOR.htmlParser.basicWriter();
+		var fragment = CKEDITOR.htmlParser.fragment.fromHtml( html );
+		fragment.writeHtml( writer );
+		return writer.getHtml();
+	}
+
 	YAHOO.tool.TestRunner.add( ts = new CKEDITOR.test.suites.editorTestSuite(
 		{
@@ -35,6 +44,6 @@
 
 				editor.execCommand( 'cellMerge' );
-				assert.areEqual( test.getValueAsHtml( 'editor_data_output' ),
-						test.fixHtml( editor.getData(), false ), 'editor output data doesn\'t match.' );
+				assert.areEqual( standardize( test.getValueAsHtml( 'editor_data_output' ) ),
+						standardize( editor.getData(), false ), 'editor output data doesn\'t match.' );
 			},
 
@@ -53,6 +62,6 @@
 
 				editor.execCommand( 'cellMerge' );
-				assert.areEqual( test.getValueAsHtml( 'editor_data_output_2' ),
-						test.fixHtml( editor.getData(), false ), 'editor output data doesn\'t match.' );
+				assert.areEqual( standardize( test.getValueAsHtml( 'editor_data_output_2' ) ),
+						standardize( editor.getData() ), 'editor output data doesn\'t match.' );
 			},
 
@@ -68,6 +77,6 @@
 
 				var result = editor.execCommand( 'cellMerge' );
-				assert.areEqual( test.getValueAsHtml( 'editor_data_output_3' ),
-						test.fixHtml( editor.getData(), false ), 'editor output data doesn\'t match.' );
+				assert.areEqual( standardize( test.getValueAsHtml( 'editor_data_output_3' ) ),
+						standardize( editor.getData() ), 'editor output data doesn\'t match.' );
 			},
 
@@ -86,6 +95,6 @@
 
 				var result = editor.execCommand( 'cellMerge' );
-				assert.areEqual( test.getValueAsHtml( 'editor_data_output_4' ),
-						test.fixHtml( editor.getData(), false ), 'editor output data doesn\'t match.' );
+				assert.areEqual( standardize( test.getValueAsHtml( 'editor_data_output_4' ) ),
+						standardize( editor.getData() ), 'editor output data doesn\'t match.' );
 			},
 
@@ -104,6 +113,6 @@
 
 				var result = editor.execCommand( 'cellMerge' );
-				assert.areEqual( test.getValueAsHtml( 'editor_data_output_5' ),
-						test.fixHtml( editor.getData(), false ), 'editor output data doesn\'t match.' );
+				assert.areEqual( standardize( test.getValueAsHtml( 'editor_data_output_5' ) ),
+						standardize( editor.getData() ), 'editor output data doesn\'t match.' );
 			},
 			
@@ -119,6 +128,6 @@
 
 				var result = editor.execCommand( 'cellMerge' );
-				assert.areEqual( test.getValueAsHtml( 'editor_data_output_6' ),
-						test.fixHtml( editor.getData(), false ), 'editor output data doesn\'t match.' );
+				assert.areEqual( standardize(test.getValueAsHtml( 'editor_data_output_6' ) ),
+						standardize( editor.getData() ), 'editor output data doesn\'t match.' );
 			}
 		} ) );
@@ -150,7 +159,5 @@
 		<tr>
 			<td>
-				cell1cell2<br/>
-				cell3cell4<br/>
-				cell5cell6</td>
+				cell1cell2<br />cell3cell4<br />cell5cell6</td>
 		</tr>
 	</tbody>
@@ -183,10 +190,5 @@
 			<td rowspan="2">
 				cell1</td>
-			<td rowspan="3">
-				cell2<br/>
-				cell3cell4<br/>
-				cell6</td>
-		</tr>
-		<tr>
+			<td rowspan="3">cell2<br />cell3cell4<br />cell6</td>
 		</tr>
 		<tr>
@@ -256,7 +258,5 @@
 		</tr>
 		<tr>
-			<td colspan="2" rowspan="2">
-				cell3cell4<br/>
-				cell6</td>
+				<td colspan="2" rowspan="2">cell3cell4<br />cell6</td>
 		</tr>
 		<tr>
@@ -307,5 +307,5 @@
 		<tr>
 			<td>
-				cell1<br/>
+				cell1<br />
 				cell2</td>
 		</tr>
Index: /CKEditor/tests/tt/4574/3.html
===================================================================
--- /CKEditor/tests/tt/4574/3.html	(revision 4808)
+++ /CKEditor/tests/tt/4574/3.html	(revision 4809)
@@ -103,5 +103,5 @@
 		<tr>
 			<td rowspan="2">
-				cell1<br/>
+				cell1<br />
 				cell3</td>
 			<td rowspan="2">