diff --git a/templates/overrides/navigation/block--system-branding-block.html.twig b/templates/overrides/navigation/block--system-branding-block.html.twig
index 95e6ef79b710c7b72bd6fc4b70e2e3d11bb5a7ac..2c7b6a2641f27d7acd28e3d45c94805c44e71d1f 100644
--- a/templates/overrides/navigation/block--system-branding-block.html.twig
+++ b/templates/overrides/navigation/block--system-branding-block.html.twig
@@ -16,7 +16,7 @@
 
 {% block content %}
   {% apply spaceless %}
-    {# project name #}
+    {# Project name. #}
     {% if site_logo is not empty or site_name is not empty %}
       {% set project_classes = 'bcl-header__project' %}
       {% if light is not empty %}
diff --git a/templates/overrides/page/page.html.twig b/templates/overrides/page/page.html.twig
index cfa28385c911a37fc9a517c17961d498baa2d63a..e42c45c5910b596eac8ff98df38a39a998ddb007 100644
--- a/templates/overrides/page/page.html.twig
+++ b/templates/overrides/page/page.html.twig
@@ -85,7 +85,7 @@
 
       {{ page.navbar_branding }}
 
-      {# navbar #}
+      {# Navbar. #}
       {% block navbar %}
         {{ pattern('navbar', {
           navigation: page.header_left,
@@ -96,7 +96,7 @@
           attributes: create_attribute().addClass(['bcl-header__navbar']),
         }) }}
       {% endblock %}
-      {# breadcrumbs #}
+      {# Breadcrumbs. #}
       <div class="container">
         {% block breadcrumbs %}
           {{ page.breadcrumbs }}
diff --git a/tests/src/Kernel/SiteBrandingBlockTest.php b/tests/src/Kernel/SiteBrandingBlockTest.php
index d4f93be4a9e67138f669486162a5e71fe65f4b1e..16bad8b752772e8026f71fab8e12ceabf22663dd 100644
--- a/tests/src/Kernel/SiteBrandingBlockTest.php
+++ b/tests/src/Kernel/SiteBrandingBlockTest.php
@@ -29,7 +29,6 @@ class SiteBrandingBlockTest extends KernelTestBase {
     parent::setUp();
 
     \Drupal::service('theme_installer')->install(['oe_whitelabel']);
-    $this->container->set('theme.registry', NULL);
     $url = '/' . drupal_get_path('theme', 'oe_whitelabel') . '/logo.svg';
 
     \Drupal::configFactory()
@@ -47,8 +46,6 @@ class SiteBrandingBlockTest extends KernelTestBase {
       ->set('name', 'Site name')
       ->set('slogan', 'Slogan')
       ->save();
-
-    $this->container->set('theme.registry', NULL);
   }
 
   /**