diff --git a/includes/create-theme/theme-locale.php b/includes/create-theme/theme-locale.php
index c50ffc43..ab7ed778 100644
--- a/includes/create-theme/theme-locale.php
+++ b/includes/create-theme/theme-locale.php
@@ -83,7 +83,7 @@ private static function escape_text_content( $string ) {
 		// If tokens is not empty, format the string using sprintf.
 		if ( ! empty( $tokens ) ) {
 			// Format the string, replacing the placeholders with the formatted tokens.
-			return "<?php\n/* Translators: %s are html tags */\necho sprintf( esc_html__( '$text', '" . wp_get_theme()->get( 'TextDomain' ) . "' ), " . implode(
+			return "<?php /* Translators: %s are html tags */ echo sprintf( esc_html__( '$text', '" . wp_get_theme()->get( 'TextDomain' ) . "' ), " . implode(
 				', ',
 				array_map(
 					function( $token ) {
@@ -91,7 +91,7 @@ function( $token ) {
 					},
 					$tokens
 				)
-			) . '); ?>';
+			) . ' ); ?>';
 		}
 
 		return "<?php esc_html_e('" . $string . "', '" . wp_get_theme()->get( 'TextDomain' ) . "');?>";
diff --git a/tests/CbtThemeLocale/escapeTextContent.php b/tests/CbtThemeLocale/escapeTextContent.php
index 32609243..d3d0e4c4 100644
--- a/tests/CbtThemeLocale/escapeTextContent.php
+++ b/tests/CbtThemeLocale/escapeTextContent.php
@@ -37,9 +37,10 @@ public function test_escape_text_content_with_double_quote() {
 	}
 
 	public function test_escape_text_content_with_html() {
-		$string         = '<p>This is a test text with HTML.</p>';
-		$escaped_string = $this->call_private_method( 'escape_text_content', array( $string ) );
-		$this->assertEquals( "<?php esc_html_e('<p>This is a test text with HTML.</p>', 'test-locale-theme');?>", $escaped_string );
+		$string          = '<p>This is a test text with HTML.</p>';
+		$escaped_string  = $this->call_private_method( 'escape_text_content', array( $string ) );
+		$expected_output = "<?php /* Translators: %s are html tags */ echo sprintf( esc_html__( '%sThis is a test text with HTML.%s', 'test-locale-theme' ), '<p>', '</p>' ); ?>";
+		$this->assertEquals( $expected_output, $escaped_string );
 	}
 
 	public function test_escape_text_content_with_already_escaped_string() {
diff --git a/tests/CbtThemeLocale/escapeTextContentOfBlocks.php b/tests/CbtThemeLocale/escapeTextContentOfBlocks.php
index 2fee4adf..34d705c6 100644
--- a/tests/CbtThemeLocale/escapeTextContentOfBlocks.php
+++ b/tests/CbtThemeLocale/escapeTextContentOfBlocks.php
@@ -108,7 +108,7 @@ public function data_test_escape_text_content_of_blocks() {
                     <!-- /wp:verse -->',
 				'expected_markup' =>
 					'<!-- wp:verse {"style":{"layout":{"selfStretch":"fit","flexSize":null}}} -->
-                    <pre class="wp-block-verse"><?php esc_html_e(\'Ya somos el olvido que seremos.<br>El polvo elemental que nos ignora<br>y que fue el rojo Adán y que es ahora<br>todos los hombres, y que no veremos.\', \'test-locale-theme\');?></pre>
+                    <pre class="wp-block-verse"><?php /* Translators: %s are html tags */ echo sprintf( esc_html__( \'Ya somos el olvido que seremos.%sEl polvo elemental que nos ignora%sy que fue el rojo Adán y que es ahora%stodos los hombres, y que no veremos.\', \'test-locale-theme\' ), \'<br>\', \'<br>\', \'<br>\' ); ?></pre>
                     <!-- /wp:verse -->',
 			),
 
diff --git a/tests/test-theme-templates.php b/tests/test-theme-templates.php
index e2842800..f3aec6e6 100644
--- a/tests/test-theme-templates.php
+++ b/tests/test-theme-templates.php
@@ -159,12 +159,12 @@ public function test_properly_encode_lessthan_and_greaterthan() {
 
 	public function test_properly_encode_html_markup() {
 		$template          = new stdClass();
-		$template->content = '<!-- wp:paragraph -->
-			<p><strong>Bold</strong> text has feelings &lt;&gt; TOO</p>
-			<!-- /wp:paragraph -->';
+		$template->content = '<!-- wp:paragraph --><p><strong>Bold</strong> text has feelings &lt;&gt; TOO</p><!-- /wp:paragraph -->';
 		$escaped_template  = CBT_Theme_Templates::escape_text_in_template( $template );
 
-		$this->assertStringContainsString( "<?php esc_html_e('<strong>Bold</strong> text has feelings &lt;&gt; TOO', '');?>", $escaped_template->content );
+		$expected_output = '<!-- wp:paragraph --><p><?php /* Translators: %s are html tags */ echo sprintf( esc_html__( \'%sBold%s text has feelings &lt;&gt; TOO\', \'\' ), \'<strong>\', \'</strong>\' ); ?></p><!-- /wp:paragraph -->';
+
+		$this->assertStringContainsString( $expected_output, $escaped_template->content );
 	}
 
 	public function test_empty_alt_text_is_not_localized() {
@@ -262,7 +262,12 @@ public function test_localize_verse() {
 			<pre class="wp-block-verse">Here is some <strong>verse</strong> to localize</pre>
 		<!-- /wp:verse -->';
 		$new_template      = CBT_Theme_Templates::escape_text_in_template( $template );
-		$this->assertStringContainsString( "<?php esc_html_e('Here is some <strong>verse</strong> to localize', '');?>", $new_template->content );
+
+		$expected_output = '<!-- wp:verse -->
+			<pre class="wp-block-verse"><?php /* Translators: %s are html tags */ echo sprintf( esc_html__( \'Here is some %sverse%s to localize\', \'\' ), \'<strong>\', \'</strong>\' ); ?></pre>
+		<!-- /wp:verse -->';
+
+		$this->assertStringContainsString( $expected_output, $new_template->content );
 	}
 
 	public function test_localize_table() {