diff --git a/includes/create-theme/theme-locale.php b/includes/create-theme/theme-locale.php
index d5bb78a5..783d8715 100644
--- a/includes/create-theme/theme-locale.php
+++ b/includes/create-theme/theme-locale.php
@@ -28,7 +28,7 @@ private static function escape_text_content( $string ) {
 
 		$string = addcslashes( $string, "'" );
 
-		return "<?php esc_html_e( '" . $string . "', '" . wp_get_theme()->get( 'TextDomain' ) . "' ); ?>";
+		return "<?php esc_html_e('" . $string . "', '" . wp_get_theme()->get( 'TextDomain' ) . "');?>";
 	}
 
 	/**
@@ -54,7 +54,7 @@ private static function escape_attribute( $string ) {
 		}
 
 		$string = addcslashes( $string, "'" );
-		return "<?php esc_attr_e( '" . $string . "', '" . wp_get_theme()->get( 'TextDomain' ) . "' ); ?>";
+		return "<?php esc_attr_e('" . $string . "', '" . wp_get_theme()->get( 'TextDomain' ) . "');?>";
 	}
 
 	/**
diff --git a/includes/create-theme/theme-patterns.php b/includes/create-theme/theme-patterns.php
index 5ff62fd6..23224c2d 100644
--- a/includes/create-theme/theme-patterns.php
+++ b/includes/create-theme/theme-patterns.php
@@ -38,7 +38,7 @@ public static function escape_alt_for_pattern( $html ) {
 	public static function escape_text_for_pattern( $text ) {
 		if ( $text && trim( $text ) !== '' ) {
 			$escaped_text = addslashes( $text );
-			return "<?php esc_attr_e( '" . $escaped_text . "', '" . wp_get_theme()->get( 'Name' ) . "' ); ?>";
+			return "<?php esc_attr_e('" . $escaped_text . "', '" . wp_get_theme()->get( 'Name' ) . "');?>";
 		}
 	}
 
diff --git a/tests/CbtThemeLocale/escapeAttribute.php b/tests/CbtThemeLocale/escapeAttribute.php
new file mode 100644
index 00000000..9f511d06
--- /dev/null
+++ b/tests/CbtThemeLocale/escapeAttribute.php
@@ -0,0 +1,58 @@
+<?php
+require_once __DIR__ . '/base.php';
+
+/**
+ * Tests for the CBT_Theme_Locale::escape_attribute method.
+ *
+ * @package Create_Block_Theme
+ * @covers CBT_Theme_Locale::escape_attribute
+ * @group locale
+ */
+class CBT_Theme_Locale_EscapeAttribute extends CBT_Theme_Locale_UnitTestCase {
+
+	protected function call_private_method( $method_name, $args = array() ) {
+		$reflection = new ReflectionClass( 'CBT_Theme_Locale' );
+		$method     = $reflection->getMethod( $method_name );
+		$method->setAccessible( true );
+		return $method->invokeArgs( null, $args );
+	}
+
+	public function test_escape_attribute() {
+		$string          = 'This is a test attribute.';
+		$escaped_string  = $this->call_private_method( 'escape_attribute', array( $string ) );
+		$expected_string = "<?php esc_attr_e('This is a test attribute.', '" . wp_get_theme()->get( 'TextDomain' ) . "');?>";
+		$this->assertEquals( $expected_string, $escaped_string );
+	}
+
+	public function test_escape_attribute_with_single_quote() {
+		$string          = "This is a test attribute with a single quote '";
+		$escaped_string  = $this->call_private_method( 'escape_attribute', array( $string ) );
+		$expected_string = "<?php esc_attr_e('This is a test attribute with a single quote \\'', '" . wp_get_theme()->get( 'TextDomain' ) . "');?>";
+		$this->assertEquals( $expected_string, $escaped_string );
+	}
+
+	public function test_escape_attribute_with_double_quote() {
+		$string          = 'This is a test attribute with a double quote "';
+		$escaped_string  = $this->call_private_method( 'escape_attribute', array( $string ) );
+		$expected_string = "<?php esc_attr_e('This is a test attribute with a double quote \"', '" . wp_get_theme()->get( 'TextDomain' ) . "');?>";
+		$this->assertEquals( $expected_string, $escaped_string );
+	}
+
+	public function test_escape_attribute_with_empty_string() {
+		$string         = '';
+		$escaped_string = $this->call_private_method( 'escape_attribute', array( $string ) );
+		$this->assertEquals( $string, $escaped_string );
+	}
+
+	public function test_escape_attribute_with_already_escaped_string() {
+		$string         = "<?php esc_attr_e('This is already escaped.', '" . wp_get_theme()->get( 'TextDomain' ) . "');?>";
+		$escaped_string = $this->call_private_method( 'escape_attribute', array( $string ) );
+		$this->assertEquals( $string, $escaped_string );
+	}
+
+	public function test_escape_attribute_with_non_string() {
+		$string         = null;
+		$escaped_string = $this->call_private_method( 'escape_attribute', array( $string ) );
+		$this->assertEquals( $string, $escaped_string );
+	}
+}
diff --git a/tests/CbtThemeLocale/escapeTextContent.php b/tests/CbtThemeLocale/escapeTextContent.php
new file mode 100644
index 00000000..32609243
--- /dev/null
+++ b/tests/CbtThemeLocale/escapeTextContent.php
@@ -0,0 +1,56 @@
+<?php
+
+require_once __DIR__ . '/base.php';
+
+/**
+ * Tests for the CBT_Theme_Locale::escape_text_content method.
+ *
+ * @package Create_Block_Theme
+ * @covers CBT_Theme_Locale::escape_text_content
+ * @group locale
+ */
+class CBT_Theme_Locale_EscapeTextContent extends CBT_Theme_Locale_UnitTestCase {
+
+	protected function call_private_method( $method_name, $args = array() ) {
+		$reflection = new ReflectionClass( 'CBT_Theme_Locale' );
+		$method     = $reflection->getMethod( $method_name );
+		$method->setAccessible( true );
+		return $method->invokeArgs( null, $args );
+	}
+
+	public function test_escape_text_content() {
+		$string         = 'This is a test text.';
+		$escaped_string = $this->call_private_method( 'escape_text_content', array( $string ) );
+		$this->assertEquals( "<?php esc_html_e('This is a test text.', 'test-locale-theme');?>", $escaped_string );
+	}
+
+	public function test_escape_text_content_with_single_quote() {
+		$string         = "This is a test text with a single quote '";
+		$escaped_string = $this->call_private_method( 'escape_text_content', array( $string ) );
+		$this->assertEquals( "<?php esc_html_e('This is a test text with a single quote \\'', 'test-locale-theme');?>", $escaped_string );
+	}
+
+	public function test_escape_text_content_with_double_quote() {
+		$string         = 'This is a test text with a double quote "';
+		$escaped_string = $this->call_private_method( 'escape_text_content', array( $string ) );
+		$this->assertEquals( "<?php esc_html_e('This is a test text with a double quote \"', 'test-locale-theme');?>", $escaped_string );
+	}
+
+	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 );
+	}
+
+	public function test_escape_text_content_with_already_escaped_string() {
+		$string         = "<?php esc_html_e('This is a test text.', 'test-locale-theme');?>";
+		$escaped_string = $this->call_private_method( 'escape_text_content', array( $string ) );
+		$this->assertEquals( $string, $escaped_string );
+	}
+
+	public function test_escape_text_content_with_non_string() {
+		$string         = null;
+		$escaped_string = $this->call_private_method( 'escape_text_content', array( $string ) );
+		$this->assertEquals( $string, $escaped_string );
+	}
+}
diff --git a/tests/CbtThemeLocale/escapeTextContentOfBlocks.php b/tests/CbtThemeLocale/escapeTextContentOfBlocks.php
index 296cb15d..2fee4adf 100644
--- a/tests/CbtThemeLocale/escapeTextContentOfBlocks.php
+++ b/tests/CbtThemeLocale/escapeTextContentOfBlocks.php
@@ -30,7 +30,7 @@ public function data_test_escape_text_content_of_blocks() {
 
 			'paragraph'                  => array(
 				'block_markup'    => '<!-- wp:paragraph {"align":"center"} --><p class="has-text-align-center">This is a test text.</p><!-- /wp:paragraph -->',
-				'expected_markup' => '<!-- wp:paragraph {"align":"center"} --><p class="has-text-align-center"><?php esc_html_e( \'This is a test text.\', \'test-locale-theme\' ); ?></p><!-- /wp:paragraph -->',
+				'expected_markup' => '<!-- wp:paragraph {"align":"center"} --><p class="has-text-align-center"><?php esc_html_e(\'This is a test text.\', \'test-locale-theme\');?></p><!-- /wp:paragraph -->',
 			),
 
 			'paragraph on nested groups' => array(
@@ -46,7 +46,7 @@ public function data_test_escape_text_content_of_blocks() {
 					'<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50","left":"var:preset|spacing|50","right":"var:preset|spacing|50"}}},"layout":{"type":"constrained","contentSize":"","wideSize":""}} -->
                     <div class="wp-block-group alignfull" style="padding-top:var(--wp--preset--spacing--50);padding-right:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:group {"style":{"spacing":{"blockGap":"0px"}},"layout":{"type":"constrained","contentSize":"565px"}} -->
                     <div class="wp-block-group"><!-- wp:paragraph {"align":"center"} -->
-                    <p class="has-text-align-center"><?php esc_html_e( \'This is a test text.\', \'test-locale-theme\' ); ?></p>
+                    <p class="has-text-align-center"><?php esc_html_e(\'This is a test text.\', \'test-locale-theme\');?></p>
                     <!-- /wp:paragraph --></div>
                     <!-- /wp:group --></div>
                     <!-- /wp:group -->',
@@ -59,7 +59,7 @@ public function data_test_escape_text_content_of_blocks() {
                     <!-- /wp:heading -->',
 				'expected_markup' =>
 					'<!-- wp:heading {"textAlign":"center","className":"is-style-asterisk"} -->
-                    <h1 class="wp-block-heading has-text-align-center is-style-asterisk"><?php esc_html_e( \'A passion for creating spaces\', \'test-locale-theme\' ); ?></h1>
+                    <h1 class="wp-block-heading has-text-align-center is-style-asterisk"><?php esc_html_e(\'A passion for creating spaces\', \'test-locale-theme\');?></h1>
                     <!-- /wp:heading -->',
 			),
 
@@ -70,7 +70,7 @@ public function data_test_escape_text_content_of_blocks() {
                     <!-- /wp:heading -->',
 				'expected_markup' =>
 					'<!-- wp:heading {"textAlign":"center","className":"is-style-asterisk"} -->
-                    <h2 class="wp-block-heading has-text-align-center is-style-asterisk"><?php esc_html_e( \'A passion for creating spaces\', \'test-locale-theme\' ); ?></h2>
+                    <h2 class="wp-block-heading has-text-align-center is-style-asterisk"><?php esc_html_e(\'A passion for creating spaces\', \'test-locale-theme\');?></h2>
                     <!-- /wp:heading -->',
 			),
 
@@ -90,13 +90,13 @@ public function data_test_escape_text_content_of_blocks() {
 				'expected_markup' =>
 					'<!-- wp:list {"style":{"typography":{"lineHeight":"1.75"}},"className":"is-style-checkmark-list"} -->
                     <ul style="line-height:1.75" class="is-style-checkmark-list"><!-- wp:list-item -->
-                    <li><?php esc_html_e( \'Collaborate with fellow architects.\', \'test-locale-theme\' ); ?></li>
+                    <li><?php esc_html_e(\'Collaborate with fellow architects.\', \'test-locale-theme\');?></li>
                     <!-- /wp:list-item -->
                     <!-- wp:list-item -->
-                    <li><?php esc_html_e( \'Showcase your projects.\', \'test-locale-theme\' ); ?></li>
+                    <li><?php esc_html_e(\'Showcase your projects.\', \'test-locale-theme\');?></li>
                     <!-- /wp:list-item -->
                     <!-- wp:list-item -->
-                    <li><?php esc_html_e( \'Experience the world of architecture.\', \'test-locale-theme\' ); ?></li>
+                    <li><?php esc_html_e(\'Experience the world of architecture.\', \'test-locale-theme\');?></li>
                     <!-- /wp:list-item --></ul>
                     <!-- /wp:list -->',
 			),
@@ -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 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>
                     <!-- /wp:verse -->',
 			),
 
@@ -119,7 +119,7 @@ public function data_test_escape_text_content_of_blocks() {
                     <!-- /wp:button -->',
 				'expected_markup' =>
 					'<!-- wp:button -->
-                    <div class="wp-block-button"><a class="wp-block-button__link wp-element-button"><?php esc_html_e( \'Sign up\', \'test-locale-theme\' ); ?></a></div>
+                    <div class="wp-block-button"><a class="wp-block-button__link wp-element-button"><?php esc_html_e(\'Sign up\', \'test-locale-theme\');?></a></div>
                     <!-- /wp:button -->',
 			),
 
@@ -130,7 +130,7 @@ public function data_test_escape_text_content_of_blocks() {
                     <!-- /wp:image -->',
 				'expected_markup' =>
 					'<!-- wp:image {"sizeSlug":"large","linkDestination":"none","className":"is-style-rounded"} -->
-                    <figure class="wp-block-image size-large is-style-rounded"><img src="http://localhost/wp1/wp-content/themes/twentytwentyfour/assets/images/windows.webp" alt="<?php esc_attr_e( \'Windows of a building in Nuremberg, Germany\', \'test-locale-theme\' ); ?>"/></figure>
+                    <figure class="wp-block-image size-large is-style-rounded"><img src="http://localhost/wp1/wp-content/themes/twentytwentyfour/assets/images/windows.webp" alt="<?php esc_attr_e(\'Windows of a building in Nuremberg, Germany\', \'test-locale-theme\');?>"/></figure>
                     <!-- /wp:image -->',
 			),
 
@@ -143,8 +143,8 @@ public function data_test_escape_text_content_of_blocks() {
                     <!-- /wp:cover -->',
 				'expected_markup' =>
 					'<!-- wp:cover {"url":"http://localhost/wp1/wp-content/uploads/2024/05/image.jpeg","id":39,"alt":"Alternative text for cover image","dimRatio":50,"customOverlayColor":"#1d2b2f","layout":{"type":"constrained"}} -->
-                    <div class="wp-block-cover"><span aria-hidden="true" class="wp-block-cover__background has-background-dim" style="background-color:#1d2b2f"></span><img class="wp-block-cover__image-background wp-image-39" alt="<?php esc_attr_e( \'Alternative text for cover image\', \'test-locale-theme\' ); ?>" src="http://localhost/wp1/wp-content/uploads/2024/05/image.jpeg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:paragraph {"align":"center","placeholder":"Write title…","fontSize":"large"} -->
-                    <p class="has-text-align-center has-large-font-size"><?php esc_html_e( \'This is a cover caption\', \'test-locale-theme\' ); ?></p>
+                    <div class="wp-block-cover"><span aria-hidden="true" class="wp-block-cover__background has-background-dim" style="background-color:#1d2b2f"></span><img class="wp-block-cover__image-background wp-image-39" alt="<?php esc_attr_e(\'Alternative text for cover image\', \'test-locale-theme\');?>" src="http://localhost/wp1/wp-content/uploads/2024/05/image.jpeg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:paragraph {"align":"center","placeholder":"Write title…","fontSize":"large"} -->
+                    <p class="has-text-align-center has-large-font-size"><?php esc_html_e(\'This is a cover caption\', \'test-locale-theme\');?></p>
                     <!-- /wp:paragraph --></div></div>
                     <!-- /wp:cover -->',
 			),
@@ -158,8 +158,8 @@ public function data_test_escape_text_content_of_blocks() {
                     <!-- /wp:media-text -->',
 				'expected_markup' =>
 					'<!-- wp:media-text {"mediaId":39,"mediaLink":"http://localhost/wp1/image/","mediaType":"image"} -->
-                    <div class="wp-block-media-text is-stacked-on-mobile"><figure class="wp-block-media-text__media"><img src="http://localhost/wp1/wp-content/uploads/2024/05/image.jpeg" alt="<?php esc_attr_e( \'This is alt text\', \'test-locale-theme\' ); ?>" class="wp-image-39 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Content…"} -->
-                    <p><?php esc_html_e( \'Media text content test.\', \'test-locale-theme\' ); ?></p>
+                    <div class="wp-block-media-text is-stacked-on-mobile"><figure class="wp-block-media-text__media"><img src="http://localhost/wp1/wp-content/uploads/2024/05/image.jpeg" alt="<?php esc_attr_e(\'This is alt text\', \'test-locale-theme\');?>" class="wp-image-39 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Content…"} -->
+                    <p><?php esc_html_e(\'Media text content test.\', \'test-locale-theme\');?></p>
                     <!-- /wp:paragraph --></div></div>
                     <!-- /wp:media-text -->',
 			),
@@ -171,7 +171,7 @@ public function data_test_escape_text_content_of_blocks() {
                     <!-- /wp:pullquote -->',
 				'expected_markup' =>
 					'<!-- wp:pullquote -->
-                    <figure class="wp-block-pullquote"><blockquote><p><?php esc_html_e( \'Yo me equivoqué y pagué, pero la pelota no se mancha.\', \'test-locale-theme\' ); ?></p><cite><?php esc_html_e( \'Diego Armando Maradona\', \'test-locale-theme\' ); ?></cite></blockquote></figure>
+                    <figure class="wp-block-pullquote"><blockquote><p><?php esc_html_e(\'Yo me equivoqué y pagué, pero la pelota no se mancha.\', \'test-locale-theme\');?></p><cite><?php esc_html_e(\'Diego Armando Maradona\', \'test-locale-theme\');?></cite></blockquote></figure>
                     <!-- /wp:pullquote -->',
 			),
 
@@ -182,7 +182,7 @@ public function data_test_escape_text_content_of_blocks() {
                     <!-- /wp:table -->',
 				'expected_markup' =>
 					'<!-- wp:table -->
-                    <figure class="wp-block-table"><table><tbody><tr><td><?php esc_html_e( \'Team\', \'test-locale-theme\' ); ?></td><td><?php esc_html_e( \'Points\', \'test-locale-theme\' ); ?></td></tr><tr><td><?php esc_html_e( \'Boca\', \'test-locale-theme\' ); ?></td><td><?php esc_html_e( \'74\', \'test-locale-theme\' ); ?></td></tr><tr><td><?php esc_html_e( \'River\', \'test-locale-theme\' ); ?></td><td><?php esc_html_e( \'2\', \'test-locale-theme\' ); ?></td></tr></tbody></table><figcaption class="wp-element-caption"><?php esc_html_e( \'Score table\', \'test-locale-theme\' ); ?></figcaption></figure>
+                    <figure class="wp-block-table"><table><tbody><tr><td><?php esc_html_e(\'Team\', \'test-locale-theme\');?></td><td><?php esc_html_e(\'Points\', \'test-locale-theme\');?></td></tr><tr><td><?php esc_html_e(\'Boca\', \'test-locale-theme\');?></td><td><?php esc_html_e(\'74\', \'test-locale-theme\');?></td></tr><tr><td><?php esc_html_e(\'River\', \'test-locale-theme\');?></td><td><?php esc_html_e(\'2\', \'test-locale-theme\');?></td></tr></tbody></table><figcaption class="wp-element-caption"><?php esc_html_e(\'Score table\', \'test-locale-theme\');?></figcaption></figure>
                     <!-- /wp:table -->',
 			),
 
diff --git a/tests/test-theme-templates.php b/tests/test-theme-templates.php
index 0ab57e2c..e2842800 100644
--- a/tests/test-theme-templates.php
+++ b/tests/test-theme-templates.php
@@ -12,7 +12,7 @@ public function test_paragraphs_are_localized() {
 		$template          = new stdClass();
 		$template->content = '<!-- wp:paragraph --><p>This is text to localize</p><!-- /wp:paragraph -->';
 		$new_template      = CBT_Theme_Templates::escape_text_in_template( $template );
-		$this->assertStringContainsString( "<p><?php esc_html_e( 'This is text to localize', '' ); ?></p>", $new_template->content );
+		$this->assertStringContainsString( "<p><?php esc_html_e('This is text to localize', '');?></p>", $new_template->content );
 		$this->assertStringNotContainsString( '<p>This is text to localize</p>', $new_template->content );
 	}
 
@@ -45,7 +45,7 @@ public function test_paragraphs_in_groups_are_localized() {
 			</div>
 			<!-- /wp:group -->';
 		$new_template      = CBT_Theme_Templates::escape_text_in_template( $template );
-		$this->assertStringContainsString( "<?php esc_html_e( 'This is text to localize', '' ); ?>", $new_template->content );
+		$this->assertStringContainsString( "<?php esc_html_e('This is text to localize', '');?>", $new_template->content );
 		$this->assertStringNotContainsString( '<p>This is text to localize</p>', $new_template->content );
 	}
 
@@ -57,7 +57,7 @@ public function test_buttons_are_localized() {
 					</div>
 				<!-- /wp:button -->';
 		$new_template      = CBT_Theme_Templates::escape_text_in_template( $template );
-		$this->assertStringContainsString( "<?php esc_html_e( 'This is text to localize', '' ); ?>", $new_template->content );
+		$this->assertStringContainsString( "<?php esc_html_e('This is text to localize', '');?>", $new_template->content );
 		$this->assertStringNotContainsString( '<a class="wp-block-button__link wp-element-button">This is text to localize</a>', $new_template->content );
 	}
 
@@ -69,7 +69,7 @@ public function test_headings_are_localized() {
 			<!-- /wp:heading -->
 		';
 		$new_template      = CBT_Theme_Templates::escape_text_in_template( $template );
-		$this->assertStringContainsString( "<?php esc_html_e( 'This is a heading to localize.', '' ); ?>", $new_template->content );
+		$this->assertStringContainsString( "<?php esc_html_e('This is a heading to localize.', '');?>", $new_template->content );
 		$this->assertStringNotContainsString( '<h2 class="wp-block-heading">This is a heading to localize.</h2>', $new_template->content );
 	}
 
@@ -143,8 +143,8 @@ public function test_properly_encode_quotes_and_doublequotes() {
 		<!-- /wp:heading -->';
 		$escaped_template  = CBT_Theme_Templates::escape_text_in_template( $template );
 
-		/* That looks like a mess, but what it should look like for REAL is <?php esc_html_e('"This" is a \'test\'', '' ); ?> */
-		$this->assertStringContainsString( "<?php esc_html_e( '\"This\" is a \\'test\\'', '' ); ?>", $escaped_template->content );
+		/* That looks like a mess, but what it should look like for REAL is <?php esc_html_e('"This" is a \'test\'', '');?> */
+		$this->assertStringContainsString( "<?php esc_html_e('\"This\" is a \\'test\\'', '');?>", $escaped_template->content );
 	}
 
 	public function test_properly_encode_lessthan_and_greaterthan() {
@@ -154,7 +154,7 @@ public function test_properly_encode_lessthan_and_greaterthan() {
 		<!-- /wp:heading -->';
 		$escaped_template  = CBT_Theme_Templates::escape_text_in_template( $template );
 
-		$this->assertStringContainsString( "<?php esc_html_e( '&lt;This> is a &lt;test&gt;', '' ); ?>", $escaped_template->content );
+		$this->assertStringContainsString( "<?php esc_html_e('&lt;This> is a &lt;test&gt;', '');?>", $escaped_template->content );
 	}
 
 	public function test_properly_encode_html_markup() {
@@ -164,7 +164,7 @@ public function test_properly_encode_html_markup() {
 			<!-- /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 );
+		$this->assertStringContainsString( "<?php esc_html_e('<strong>Bold</strong> text has feelings &lt;&gt; TOO', '');?>", $escaped_template->content );
 	}
 
 	public function test_empty_alt_text_is_not_localized() {
@@ -186,7 +186,7 @@ public function test_localize_alt_text_from_image() {
 			<!-- /wp:image -->
 		';
 		$new_template      = CBT_Theme_Templates::escape_text_in_template( $template );
-		$this->assertStringContainsString( 'alt="<?php esc_attr_e( \'This is alt text\', \'\' ); ?>"', $new_template->content );
+		$this->assertStringContainsString( 'alt="<?php esc_attr_e(\'This is alt text\', \'\');?>"', $new_template->content );
 	}
 
 	public function test_localize_alt_text_from_cover() {
@@ -206,7 +206,7 @@ public function test_localize_alt_text_from_cover() {
 		';
 		$new_template      = CBT_Theme_Templates::escape_text_in_template( $template );
 		// Check the markup attribute
-		$this->assertStringContainsString( 'alt="<?php esc_attr_e( \'This is alt text\', \'\' ); ?>"', $new_template->content );
+		$this->assertStringContainsString( 'alt="<?php esc_attr_e(\'This is alt text\', \'\');?>"', $new_template->content );
 	}
 
 	public function test_localize_quote() {
@@ -220,8 +220,8 @@ public function test_localize_quote() {
 			</blockquote>
 		<!-- /wp:quote -->';
 		$new_template      = CBT_Theme_Templates::escape_text_in_template( $template );
-		$this->assertStringContainsString( "<?php esc_html_e( 'This is my Quote', '' ); ?>", $new_template->content );
-		$this->assertStringContainsString( "<?php esc_html_e( 'Citation too', '' ); ?>", $new_template->content );
+		$this->assertStringContainsString( "<?php esc_html_e('This is my Quote', '');?>", $new_template->content );
+		$this->assertStringContainsString( "<?php esc_html_e('Citation too', '');?>", $new_template->content );
 	}
 
 	public function test_localize_pullquote() {
@@ -235,8 +235,8 @@ public function test_localize_pullquote() {
 			</figure>
 		<!-- /wp:pullquote -->';
 		$new_template      = CBT_Theme_Templates::escape_text_in_template( $template );
-		$this->assertStringContainsString( "<?php esc_html_e( 'This is my Quote', '' ); ?>", $new_template->content );
-		$this->assertStringContainsString( "<?php esc_html_e( 'Citation too', '' ); ?>", $new_template->content );
+		$this->assertStringContainsString( "<?php esc_html_e('This is my Quote', '');?>", $new_template->content );
+		$this->assertStringContainsString( "<?php esc_html_e('Citation too', '');?>", $new_template->content );
 	}
 
 	public function test_localize_list() {
@@ -253,7 +253,7 @@ public function test_localize_list() {
 			</ul>
 		<!-- /wp:list -->';
 		$new_template      = CBT_Theme_Templates::escape_text_in_template( $template );
-		$this->assertStringContainsString( "<li><?php esc_html_e( 'Item One', '' ); ?></li>", $new_template->content );
+		$this->assertStringContainsString( "<li><?php esc_html_e('Item One', '');?></li>", $new_template->content );
 	}
 
 	public function test_localize_verse() {
@@ -262,7 +262,7 @@ 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 );
+		$this->assertStringContainsString( "<?php esc_html_e('Here is some <strong>verse</strong> to localize', '');?>", $new_template->content );
 	}
 
 	public function test_localize_table() {
@@ -293,10 +293,10 @@ public function test_localize_table() {
 			</figure>
 		<!-- /wp:table -->';
 		$new_template      = CBT_Theme_Templates::escape_text_in_template( $template );
-		$this->assertStringContainsString( "<td><?php esc_html_e( 'Apples', '' ); ?></td>", $new_template->content );
-		$this->assertStringContainsString( "<?php esc_html_e( 'Header One', '' ); ?>", $new_template->content );
-		$this->assertStringContainsString( "<?php esc_html_e( 'Footer One', '' ); ?>", $new_template->content );
-		$this->assertStringContainsString( "<?php esc_html_e( 'This is my caption', '' ); ?>", $new_template->content );
+		$this->assertStringContainsString( "<td><?php esc_html_e('Apples', '');?></td>", $new_template->content );
+		$this->assertStringContainsString( "<?php esc_html_e('Header One', '');?>", $new_template->content );
+		$this->assertStringContainsString( "<?php esc_html_e('Footer One', '');?>", $new_template->content );
+		$this->assertStringContainsString( "<?php esc_html_e('This is my caption', '');?>", $new_template->content );
 	}
 
 	public function test_localize_media_text() {
@@ -314,8 +314,8 @@ public function test_localize_media_text() {
 		</div>
 		<!-- /wp:media-text -->';
 		$new_template      = CBT_Theme_Templates::escape_text_in_template( $template );
-		$this->assertStringContainsString( "<?php esc_html_e( 'Content to Localize', '' ); ?>", $new_template->content );
-		$this->assertStringContainsString( "<?php esc_attr_e( 'Alt Text Is Here', '' ); ?>", $new_template->content );
+		$this->assertStringContainsString( "<?php esc_html_e('Content to Localize', '');?>", $new_template->content );
+		$this->assertStringContainsString( "<?php esc_attr_e('Alt Text Is Here', '');?>", $new_template->content );
 	}
 
 	public function test_localize_cover_block_children() {
@@ -333,7 +333,7 @@ public function test_localize_cover_block_children() {
 		';
 		$new_template      = CBT_Theme_Templates::escape_text_in_template( $template );
 
-		$this->assertStringContainsString( "<p><?php esc_html_e( 'This is text to localize', '' ); ?></p>", $new_template->content );
+		$this->assertStringContainsString( "<p><?php esc_html_e('This is text to localize', '');?></p>", $new_template->content );
 	}
 
 	public function test_localize_nested_cover_block_children() {