diff --git a/appengine/building-an-app/build/server.js b/appengine/building-an-app/build/server.js
index 6fd176d212..1d04b4a2c8 100755
--- a/appengine/building-an-app/build/server.js
+++ b/appengine/building-an-app/build/server.js
@@ -14,6 +14,7 @@
 
 'use strict';
 
+// [START gae_build_web_server_app]
 // [START app]
 // [START gae_app]
 const express = require('express');
@@ -30,5 +31,6 @@ app.listen(PORT, () => {
 });
 // [END gae_app]
 // [END app]
+// [END gae_build_web_server_app]
 
 module.exports = app;
diff --git a/appengine/building-an-app/build/test/server.test.js b/appengine/building-an-app/build/test/server.test.js
index 308e73b803..f5af8ba230 100644
--- a/appengine/building-an-app/build/test/server.test.js
+++ b/appengine/building-an-app/build/test/server.test.js
@@ -21,3 +21,9 @@ describe('gae_app', () => {
     await supertest(app).get('/').expect(200);
   });
 })
+
+describe('gae_build_web_server_app', () => {
+  it('should be listening', async () => {
+    await supertest(app).get('/').expect(200);
+  });
+})
diff --git a/appengine/building-an-app/update/server.js b/appengine/building-an-app/update/server.js
index 4eda5078a4..d4888da2c3 100755
--- a/appengine/building-an-app/update/server.js
+++ b/appengine/building-an-app/update/server.js
@@ -14,6 +14,7 @@
 
 'use strict';
 
+// [START gae_update_web_server_app]
 // [START app]
 // [START gae_update_app]
 const express = require('express');
@@ -59,5 +60,6 @@ app.listen(PORT, () => {
 });
 // [END gae_update_app]
 // [END app]
+// [END gae_update_web_server_app]
 
 module.exports = app;
diff --git a/appengine/building-an-app/update/test/server.test.js b/appengine/building-an-app/update/test/server.test.js
index 0ef0e68cf4..e04dbce14d 100755
--- a/appengine/building-an-app/update/test/server.test.js
+++ b/appengine/building-an-app/update/test/server.test.js
@@ -47,6 +47,17 @@ describe('gae_update_app', () => {
   });
 });
 
+describe('gae_update_web_server_app', () => {
+  it('should send greetings', async () => {
+    await requestObj
+      .get('/')
+      .expect(200)
+      .expect(response => {
+        assert.strictEqual(response.text, 'Hello from App Engine!');
+      });
+  });
+});
+
 describe('gae_add_display_form add_display_form', () => {
   it('should display form', async () => {
     await requestObj
diff --git a/datacatalog/cloud-client/createFilesetEntry.js b/datacatalog/cloud-client/createFilesetEntry.js
index 2561c6a27b..efbdea5c66 100644
--- a/datacatalog/cloud-client/createFilesetEntry.js
+++ b/datacatalog/cloud-client/createFilesetEntry.js
@@ -27,7 +27,6 @@ const main = async (
   entryId
 ) => {
   // [START data_catalog_create_fileset]
-  // [START datacatalog_create_fileset_tag]
   // -------------------------------
   // Import required modules.
   // -------------------------------
@@ -101,7 +100,6 @@ const main = async (
   const [response] = await datacatalog.createEntry(request);
 
   console.log(response);
-  // [END datacatalog_create_fileset_tag]
   // [END data_catalog_create_fileset]
 };
 
diff --git a/datacatalog/quickstart/createFilesetEntry.js b/datacatalog/quickstart/createFilesetEntry.js
index b178906863..87dd94e265 100644
--- a/datacatalog/quickstart/createFilesetEntry.js
+++ b/datacatalog/quickstart/createFilesetEntry.js
@@ -27,7 +27,6 @@ const main = async (
   entryId
 ) => {
   // [START data_catalog_create_fileset_quickstart]
-  // [START datacatalog_create_fileset_quickstart_tag]
   // -------------------------------
   // Import required modules.
   // -------------------------------
@@ -125,7 +124,6 @@ const main = async (
 
   console.log(response);
 };
-// [END datacatalog_create_fileset_quickstart_tag]
 // [END data_catalog_create_fileset_quickstart]
 
 // node createFilesetEntry.js <projectId> <entryGroupId> <entryId>