diff --git a/blueprints/controller-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js b/blueprints/controller-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
index 8be0644ade5..8be2a4a01b5 100644
--- a/blueprints/controller-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/controller-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
@@ -8,7 +8,7 @@ describe('<%= friendlyTestDescription %>', function() {
     // needs: ['controller:foo']
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('exists', function() {
     let controller = this.subject();
     expect(controller).to.be.ok;
diff --git a/blueprints/controller-test/mocha-files/__root__/__testType__/__path__/__test__.js b/blueprints/controller-test/mocha-files/__root__/__testType__/__path__/__test__.js
index 20e2acec4ab..63e225f6dc8 100644
--- a/blueprints/controller-test/mocha-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/controller-test/mocha-files/__root__/__testType__/__path__/__test__.js
@@ -7,7 +7,7 @@ describeModule('controller:<%= dasherizedModuleName %>', '<%= friendlyTestDescri
     // needs: ['controller:foo']
   },
   function() {
-    // Replace this with your real tests.
+    // TODO: Replace this with your real tests.
     it('exists', function() {
       let controller = this.subject();
       expect(controller).to.be.ok;
diff --git a/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index d6c0634d92c..79dade91ef5 100644
--- a/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -5,7 +5,7 @@ import { setupTest } from 'ember-mocha';
 describe('<%= friendlyTestDescription %>', function() {
   setupTest();
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('exists', function() {
     let controller = this.owner.lookup('controller:<%= controllerPathName %>');
     expect(controller).to.be.ok;
diff --git a/blueprints/controller-test/qunit-files/__root__/__testType__/__path__/__test__.js b/blueprints/controller-test/qunit-files/__root__/__testType__/__path__/__test__.js
index db26bfa5579..25a2604730a 100644
--- a/blueprints/controller-test/qunit-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/controller-test/qunit-files/__root__/__testType__/__path__/__test__.js
@@ -5,7 +5,7 @@ moduleFor('controller:<%= dasherizedModuleName %>', '<%= friendlyTestDescription
   // needs: ['controller:foo']
 });
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it exists', function(assert) {
   let controller = this.subject();
   assert.ok(controller);
diff --git a/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index e6f57bf8780..4213416e7b6 100644
--- a/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -4,7 +4,7 @@ import { setupTest } from 'ember-qunit';
 module('<%= friendlyTestDescription %>', function(hooks) {
   setupTest(hooks);
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   test('it exists', function(assert) {
     let controller = this.owner.lookup('controller:<%= controllerPathName %>');
     assert.ok(controller);
diff --git a/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
index b9e7ee7777b..5e27688598d 100644
--- a/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
@@ -29,7 +29,7 @@ import { <%= camelizedModuleName %> } from '<%= dasherizedPackageName %>/helpers
 
 describe('<%= friendlyTestName %>', function() {
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     let result = <%= camelizedModuleName %>(42);
     expect(result).to.be.ok;
diff --git a/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
index 620d514c52f..0e9276ae197 100644
--- a/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
@@ -30,7 +30,7 @@ import { <%= camelizedModuleName %> } from '<%= dasherizedPackageName %>/helpers
 
 describe('<%= friendlyTestName %>', function() {
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     let result = <%= camelizedModuleName %>(42);
     expect(result).to.be.ok;
diff --git a/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
index 444c51c08ea..62a21879351 100644
--- a/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -7,7 +7,7 @@ import { render } from '@ember/test-helpers';
 describe('<%= friendlyTestName %>', function() {
   setupRenderingTest();
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('renders', async function() {
     this.set('inputValue', '1234');
 
@@ -20,7 +20,7 @@ import { <%= camelizedModuleName %> } from '<%= dasherizedPackageName %>/helpers
 
 describe('<%= friendlyTestName %>', function() {
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     let result = <%= camelizedModuleName %>(42);
     expect(result).to.be.ok;
diff --git a/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
index 5afdb3916b4..2182592ebcd 100644
--- a/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
@@ -5,7 +5,7 @@ moduleForComponent('<%= dasherizedModuleName %>', 'helper:<%= dasherizedModuleNa
   integration: true
 });
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it renders', function(assert) {
   this.set('inputValue', '1234');
 
@@ -18,7 +18,7 @@ import { module, test } from 'qunit';
 
 module('<%= friendlyTestName %>');
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   let result = <%= camelizedModuleName %>([42]);
   assert.ok(result);
diff --git a/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
index 421aeadbbb9..96970ee27bc 100644
--- a/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -6,7 +6,7 @@ import { render } from '@ember/test-helpers';
 module('<%= friendlyTestName %>', function(hooks) {
   setupRenderingTest(hooks);
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   test('it renders', async function(assert) {
     this.set('inputValue', '1234');
 
@@ -21,7 +21,7 @@ import { setupTest } from 'ember-qunit';
 module('<%= friendlyTestName %>', function(hooks) {
   setupTest(hooks);
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   test('it works', function(assert) {
     let result = <%= camelizedModuleName %>([42]);
     assert.ok(result);
diff --git a/blueprints/initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js
index e6538b63373..2359278209b 100644
--- a/blueprints/initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js
+++ b/blueprints/initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js
@@ -19,7 +19,7 @@ describe('<%= friendlyTestName %>', function() {
     <% if (destroyAppExists) { %>destroyApp(application);<% } else { %>run(application, 'destroy');<% } %>
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     initialize(application);
 
diff --git a/blueprints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
index 2004acef95c..a76e9fb041b 100644
--- a/blueprints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
+++ b/blueprints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
@@ -19,7 +19,7 @@ describe('<%= friendlyTestName %>', function() {
     <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', async function() {
     await this.application.boot();
 
diff --git a/blueprints/initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js
index f427bcb1f25..809b65a6639 100644
--- a/blueprints/initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js
+++ b/blueprints/initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js
@@ -17,7 +17,7 @@ module('<%= friendlyTestName %>', {
   }
 });
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   initialize(this.application);
 
diff --git a/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
index 1d1ea681665..0ef7a9944e6 100644
--- a/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
+++ b/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
@@ -19,7 +19,7 @@ module('<%= friendlyTestName %>', function(hooks) {
     <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   test('it works', async function(assert) {
     await this.application.boot();
 
diff --git a/blueprints/instance-initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/instance-initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js
index abe04c96a3b..43199ba3bf5 100644
--- a/blueprints/instance-initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js
+++ b/blueprints/instance-initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js
@@ -20,7 +20,7 @@ describe('<%= friendlyTestName %>', function() {
     destroyApp(application);
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     initialize(appInstance);
 
diff --git a/blueprints/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
index 87d2fc6a096..7b680e4f19e 100644
--- a/blueprints/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
+++ b/blueprints/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
@@ -19,7 +19,7 @@ describe('<%= friendlyTestName %>', function() {
     <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', async function() {
     await this.instance.boot();
 
diff --git a/blueprints/instance-initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/instance-initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js
index c8517e099a9..6f075d87ce4 100644
--- a/blueprints/instance-initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js
+++ b/blueprints/instance-initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js
@@ -17,7 +17,7 @@ module('<%= friendlyTestName %>', {
   }
 });
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   initialize(this.appInstance);
 
diff --git a/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
index 069c669b141..7efaeafe77a 100644
--- a/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
+++ b/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
@@ -19,7 +19,7 @@ module('<%= friendlyTestName %>', function(hooks) {
     <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   test('it works', async function(assert) {
     await this.instance.boot();
 
diff --git a/blueprints/mixin-test/mocha-files/__root__/__testType__/__name__-test.js b/blueprints/mixin-test/mocha-files/__root__/__testType__/__name__-test.js
index 07938b78ea3..34491730117 100644
--- a/blueprints/mixin-test/mocha-files/__root__/__testType__/__name__-test.js
+++ b/blueprints/mixin-test/mocha-files/__root__/__testType__/__name__-test.js
@@ -4,7 +4,7 @@ import EmberObject from '@ember/object';
 import <%= classifiedModuleName %>Mixin from '<%= dasherizedPackageName %>/mixins/<%= dasherizedModuleName %>';
 
 describe('<%= friendlyTestName %>', function() {
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     let <%= classifiedModuleName %>Object = EmberObject.extend(<%= classifiedModuleName %>Mixin);
     let subject = <%= classifiedModuleName %>Object.create();
diff --git a/blueprints/mixin-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js b/blueprints/mixin-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js
index 07938b78ea3..34491730117 100644
--- a/blueprints/mixin-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js
+++ b/blueprints/mixin-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js
@@ -4,7 +4,7 @@ import EmberObject from '@ember/object';
 import <%= classifiedModuleName %>Mixin from '<%= dasherizedPackageName %>/mixins/<%= dasherizedModuleName %>';
 
 describe('<%= friendlyTestName %>', function() {
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     let <%= classifiedModuleName %>Object = EmberObject.extend(<%= classifiedModuleName %>Mixin);
     let subject = <%= classifiedModuleName %>Object.create();
diff --git a/blueprints/mixin-test/qunit-files/__root__/__testType__/__name__-test.js b/blueprints/mixin-test/qunit-files/__root__/__testType__/__name__-test.js
index e5de1f13257..7888ebc1d68 100644
--- a/blueprints/mixin-test/qunit-files/__root__/__testType__/__name__-test.js
+++ b/blueprints/mixin-test/qunit-files/__root__/__testType__/__name__-test.js
@@ -4,7 +4,7 @@ import { module, test } from 'qunit';
 
 module('<%= friendlyTestName %>');
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   let <%= classifiedModuleName %>Object = EmberObject.extend(<%= classifiedModuleName %>Mixin);
   let subject = <%= classifiedModuleName %>Object.create();
diff --git a/blueprints/mixin-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js b/blueprints/mixin-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
index 68503100809..de7dde8fe26 100644
--- a/blueprints/mixin-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
+++ b/blueprints/mixin-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
@@ -3,7 +3,7 @@ import <%= classifiedModuleName %>Mixin from '<%= projectName %>/mixins/<%= dash
 import { module, test } from 'qunit';
 
 module('<%= friendlyTestName %>', function() {
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   test('it works', function (assert) {
     let <%= classifiedModuleName %>Object = EmberObject.extend(<%= classifiedModuleName %>Mixin);
     let subject = <%= classifiedModuleName %>Object.create();
diff --git a/blueprints/service-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js b/blueprints/service-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
index 57786689f25..b04821213a9 100644
--- a/blueprints/service-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/service-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
@@ -8,7 +8,7 @@ describe('<%= friendlyTestDescription %>', function() {
     // needs: ['service:foo']
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('exists', function() {
     let service = this.subject();
     expect(service).to.be.ok;
diff --git a/blueprints/service-test/mocha-files/__root__/__testType__/__path__/__test__.js b/blueprints/service-test/mocha-files/__root__/__testType__/__path__/__test__.js
index c9ce0f40136..53638511c68 100644
--- a/blueprints/service-test/mocha-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/service-test/mocha-files/__root__/__testType__/__path__/__test__.js
@@ -7,7 +7,7 @@ describeModule('service:<%= dasherizedModuleName %>', '<%= friendlyTestDescripti
     // needs: ['service:foo']
   },
   function() {
-    // Replace this with your real tests.
+    // TODO: Replace this with your real tests.
     it('exists', function() {
       let service = this.subject();
       expect(service).to.be.ok;
diff --git a/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 380efe2bf3d..ca0b4e65955 100644
--- a/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -5,7 +5,7 @@ import { setupTest } from 'ember-mocha';
 describe('<%= friendlyTestDescription %>', function() {
   setupTest();
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('exists', function() {
     let service = this.owner.lookup('service:<%= dasherizedModuleName %>');
     expect(service).to.be.ok;
diff --git a/blueprints/service-test/qunit-files/__root__/__testType__/__path__/__test__.js b/blueprints/service-test/qunit-files/__root__/__testType__/__path__/__test__.js
index 94db075869c..203b9d24aa8 100644
--- a/blueprints/service-test/qunit-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/service-test/qunit-files/__root__/__testType__/__path__/__test__.js
@@ -5,7 +5,7 @@ moduleFor('service:<%= dasherizedModuleName %>', '<%= friendlyTestDescription %>
   // needs: ['service:foo']
 });
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it exists', function(assert) {
   let service = this.subject();
   assert.ok(service);
diff --git a/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index f8a9a0ad7df..5904acff9b5 100644
--- a/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -4,7 +4,7 @@ import { setupTest } from 'ember-qunit';
 module('<%= friendlyTestDescription %>', function(hooks) {
   setupTest(hooks);
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   test('it exists', function(assert) {
     let service = this.owner.lookup('service:<%= dasherizedModuleName %>');
     assert.ok(service);
diff --git a/blueprints/util-test/mocha-files/__root__/__testType__/__name__-test.js b/blueprints/util-test/mocha-files/__root__/__testType__/__name__-test.js
index ec6e518b2a9..de9e098806b 100644
--- a/blueprints/util-test/mocha-files/__root__/__testType__/__name__-test.js
+++ b/blueprints/util-test/mocha-files/__root__/__testType__/__name__-test.js
@@ -3,7 +3,7 @@ import { describe, it } from 'mocha';
 import <%= camelizedModuleName %> from '<%= dasherizedPackageName %>/utils/<%= dasherizedModuleName %>';
 
 describe('<%= friendlyTestName %>', function() {
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     let result = <%= camelizedModuleName %>();
     expect(result).to.be.ok;
diff --git a/blueprints/util-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js b/blueprints/util-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js
index ec6e518b2a9..de9e098806b 100644
--- a/blueprints/util-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js
+++ b/blueprints/util-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js
@@ -3,7 +3,7 @@ import { describe, it } from 'mocha';
 import <%= camelizedModuleName %> from '<%= dasherizedPackageName %>/utils/<%= dasherizedModuleName %>';
 
 describe('<%= friendlyTestName %>', function() {
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     let result = <%= camelizedModuleName %>();
     expect(result).to.be.ok;
diff --git a/blueprints/util-test/qunit-files/__root__/__testType__/__name__-test.js b/blueprints/util-test/qunit-files/__root__/__testType__/__name__-test.js
index 287fb465a45..9eeb7fa4bc3 100644
--- a/blueprints/util-test/qunit-files/__root__/__testType__/__name__-test.js
+++ b/blueprints/util-test/qunit-files/__root__/__testType__/__name__-test.js
@@ -3,7 +3,7 @@ import { module, test } from 'qunit';
 
 module('<%= friendlyTestName %>');
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   let result = <%= camelizedModuleName %>();
   assert.ok(result);
diff --git a/blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js b/blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
index 97d28b1a4ba..124b6a2368a 100644
--- a/blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
+++ b/blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
@@ -3,7 +3,7 @@ import { module, test } from 'qunit';
 
 module('<%= friendlyTestName %>', function() {
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   test('it works', function(assert) {
     let result = <%= camelizedModuleName %>();
     assert.ok(result);
diff --git a/node-tests/fixtures/controller-test/default-nested.js b/node-tests/fixtures/controller-test/default-nested.js
index 570f701ed50..8775fe7aefa 100644
--- a/node-tests/fixtures/controller-test/default-nested.js
+++ b/node-tests/fixtures/controller-test/default-nested.js
@@ -5,7 +5,7 @@ moduleFor('controller:foo/bar', 'Unit | Controller | foo/bar', {
   // needs: ['controller:foo']
 });
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it exists', function(assert) {
   let controller = this.subject();
   assert.ok(controller);
diff --git a/node-tests/fixtures/controller-test/default.js b/node-tests/fixtures/controller-test/default.js
index f4bea050239..97d30048db1 100644
--- a/node-tests/fixtures/controller-test/default.js
+++ b/node-tests/fixtures/controller-test/default.js
@@ -5,7 +5,7 @@ moduleFor('controller:foo', 'Unit | Controller | foo', {
   // needs: ['controller:foo']
 });
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it exists', function(assert) {
   let controller = this.subject();
   assert.ok(controller);
diff --git a/node-tests/fixtures/controller-test/mocha-0.12-nested.js b/node-tests/fixtures/controller-test/mocha-0.12-nested.js
index fbd82bbdbc4..57b82b4f136 100644
--- a/node-tests/fixtures/controller-test/mocha-0.12-nested.js
+++ b/node-tests/fixtures/controller-test/mocha-0.12-nested.js
@@ -8,7 +8,7 @@ describe('Unit | Controller | foo/bar', function() {
     // needs: ['controller:foo']
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('exists', function() {
     let controller = this.subject();
     expect(controller).to.be.ok;
diff --git a/node-tests/fixtures/controller-test/mocha-0.12.js b/node-tests/fixtures/controller-test/mocha-0.12.js
index 838504f968e..eb39fcd92be 100644
--- a/node-tests/fixtures/controller-test/mocha-0.12.js
+++ b/node-tests/fixtures/controller-test/mocha-0.12.js
@@ -8,7 +8,7 @@ describe('Unit | Controller | foo', function() {
     // needs: ['controller:foo']
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('exists', function() {
     let controller = this.subject();
     expect(controller).to.be.ok;
diff --git a/node-tests/fixtures/controller-test/mocha-nested.js b/node-tests/fixtures/controller-test/mocha-nested.js
index 9f96c6391bd..8e3a62027b1 100644
--- a/node-tests/fixtures/controller-test/mocha-nested.js
+++ b/node-tests/fixtures/controller-test/mocha-nested.js
@@ -7,7 +7,7 @@ describeModule('controller:foo/bar', 'Unit | Controller | foo/bar',
     // needs: ['controller:foo']
   },
   function() {
-    // Replace this with your real tests.
+    // TODO: Replace this with your real tests.
     it('exists', function() {
       let controller = this.subject();
       expect(controller).to.be.ok;
diff --git a/node-tests/fixtures/controller-test/mocha-rfc232-nested.js b/node-tests/fixtures/controller-test/mocha-rfc232-nested.js
index fe082530619..addbae8ee7d 100644
--- a/node-tests/fixtures/controller-test/mocha-rfc232-nested.js
+++ b/node-tests/fixtures/controller-test/mocha-rfc232-nested.js
@@ -5,7 +5,7 @@ import { setupTest } from 'ember-mocha';
 describe('Unit | Controller | foo/bar', function() {
   setupTest();
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('exists', function() {
     let controller = this.owner.lookup('controller:foo/bar');
     expect(controller).to.be.ok;
diff --git a/node-tests/fixtures/controller-test/mocha-rfc232.js b/node-tests/fixtures/controller-test/mocha-rfc232.js
index fc5348ddea0..b21b4dadb5b 100644
--- a/node-tests/fixtures/controller-test/mocha-rfc232.js
+++ b/node-tests/fixtures/controller-test/mocha-rfc232.js
@@ -5,7 +5,7 @@ import { setupTest } from 'ember-mocha';
 describe('Unit | Controller | foo', function() {
   setupTest();
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('exists', function() {
     let controller = this.owner.lookup('controller:foo');
     expect(controller).to.be.ok;
diff --git a/node-tests/fixtures/controller-test/mocha.js b/node-tests/fixtures/controller-test/mocha.js
index 48721cf45bb..2ab57c0d820 100644
--- a/node-tests/fixtures/controller-test/mocha.js
+++ b/node-tests/fixtures/controller-test/mocha.js
@@ -7,7 +7,7 @@ describeModule('controller:foo', 'Unit | Controller | foo',
     // needs: ['controller:foo']
   },
   function() {
-    // Replace this with your real tests.
+    // TODO: Replace this with your real tests.
     it('exists', function() {
       let controller = this.subject();
       expect(controller).to.be.ok;
diff --git a/node-tests/fixtures/controller-test/rfc232-nested.js b/node-tests/fixtures/controller-test/rfc232-nested.js
index 0efcb96232b..a4b9f1b4ec4 100644
--- a/node-tests/fixtures/controller-test/rfc232-nested.js
+++ b/node-tests/fixtures/controller-test/rfc232-nested.js
@@ -4,7 +4,7 @@ import { setupTest } from 'ember-qunit';
 module('Unit | Controller | foo/bar', function(hooks) {
   setupTest(hooks);
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   test('it exists', function(assert) {
     let controller = this.owner.lookup('controller:foo/bar');
     assert.ok(controller);
diff --git a/node-tests/fixtures/controller-test/rfc232.js b/node-tests/fixtures/controller-test/rfc232.js
index 2b12450677c..7b7fce3846e 100644
--- a/node-tests/fixtures/controller-test/rfc232.js
+++ b/node-tests/fixtures/controller-test/rfc232.js
@@ -4,7 +4,7 @@ import { setupTest } from 'ember-qunit';
 module('Unit | Controller | foo', function(hooks) {
   setupTest(hooks);
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   test('it exists', function(assert) {
     let controller = this.owner.lookup('controller:foo');
     assert.ok(controller);
diff --git a/node-tests/fixtures/helper-test/integration.js b/node-tests/fixtures/helper-test/integration.js
index 1c3e12d7ca1..ad4f7e3782b 100644
--- a/node-tests/fixtures/helper-test/integration.js
+++ b/node-tests/fixtures/helper-test/integration.js
@@ -5,7 +5,7 @@ moduleForComponent('foo/bar-baz', 'helper:foo/bar-baz', {
   integration: true
 });
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it renders', function(assert) {
   this.set('inputValue', '1234');
 
diff --git a/node-tests/fixtures/helper-test/mocha-0.12-unit.js b/node-tests/fixtures/helper-test/mocha-0.12-unit.js
index 31d3a587b5c..bcce8c2c865 100644
--- a/node-tests/fixtures/helper-test/mocha-0.12-unit.js
+++ b/node-tests/fixtures/helper-test/mocha-0.12-unit.js
@@ -4,7 +4,7 @@ import { fooBarBaz } from 'my-app/helpers/foo/bar-baz';
 
 describe('Unit | Helper | foo/bar-baz', function() {
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     let result = fooBarBaz(42);
     expect(result).to.be.ok;
diff --git a/node-tests/fixtures/helper-test/mocha-rfc232-unit.js b/node-tests/fixtures/helper-test/mocha-rfc232-unit.js
index d0a740ce037..f19b35a93f7 100644
--- a/node-tests/fixtures/helper-test/mocha-rfc232-unit.js
+++ b/node-tests/fixtures/helper-test/mocha-rfc232-unit.js
@@ -4,7 +4,7 @@ import { fooBarBaz } from 'my-app/helpers/foo/bar-baz';
 
 describe('Unit | Helper | foo/bar-baz', function() {
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     let result = fooBarBaz(42);
     expect(result).to.be.ok;
diff --git a/node-tests/fixtures/helper-test/mocha-rfc232.js b/node-tests/fixtures/helper-test/mocha-rfc232.js
index 8f2a8d4338f..9944e574437 100644
--- a/node-tests/fixtures/helper-test/mocha-rfc232.js
+++ b/node-tests/fixtures/helper-test/mocha-rfc232.js
@@ -7,7 +7,7 @@ import hbs from 'htmlbars-inline-precompile';
 describe('Integration | Helper | foo/bar-baz', function() {
   setupRenderingTest();
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('renders', async function() {
     this.set('inputValue', '1234');
 
diff --git a/node-tests/fixtures/helper-test/mocha-unit.js b/node-tests/fixtures/helper-test/mocha-unit.js
index 31d3a587b5c..bcce8c2c865 100644
--- a/node-tests/fixtures/helper-test/mocha-unit.js
+++ b/node-tests/fixtures/helper-test/mocha-unit.js
@@ -4,7 +4,7 @@ import { fooBarBaz } from 'my-app/helpers/foo/bar-baz';
 
 describe('Unit | Helper | foo/bar-baz', function() {
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     let result = fooBarBaz(42);
     expect(result).to.be.ok;
diff --git a/node-tests/fixtures/helper-test/module-unification/addon-unit.js b/node-tests/fixtures/helper-test/module-unification/addon-unit.js
index b8fbfd87b7b..d38c3e2629c 100644
--- a/node-tests/fixtures/helper-test/module-unification/addon-unit.js
+++ b/node-tests/fixtures/helper-test/module-unification/addon-unit.js
@@ -4,7 +4,7 @@ import { module, test } from 'qunit';
 
 module('Unit | Helper | foo/bar-baz');
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   let result = fooBarBaz([42]);
   assert.ok(result);
diff --git a/node-tests/fixtures/helper-test/rfc232-unit.js b/node-tests/fixtures/helper-test/rfc232-unit.js
index 03f77998e62..fc08ea09909 100644
--- a/node-tests/fixtures/helper-test/rfc232-unit.js
+++ b/node-tests/fixtures/helper-test/rfc232-unit.js
@@ -5,7 +5,7 @@ import { setupTest } from 'ember-qunit';
 module('Unit | Helper | foo/bar-baz', function(hooks) {
   setupTest(hooks);
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   test('it works', function(assert) {
     let result = fooBarBaz([42]);
     assert.ok(result);
diff --git a/node-tests/fixtures/helper-test/rfc232.js b/node-tests/fixtures/helper-test/rfc232.js
index 8ce8201b79e..d3c10cc68a6 100644
--- a/node-tests/fixtures/helper-test/rfc232.js
+++ b/node-tests/fixtures/helper-test/rfc232.js
@@ -6,7 +6,7 @@ import hbs from 'htmlbars-inline-precompile';
 module('Integration | Helper | foo/bar-baz', function(hooks) {
   setupRenderingTest(hooks);
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   test('it renders', async function(assert) {
     this.set('inputValue', '1234');
 
diff --git a/node-tests/fixtures/helper-test/unit.js b/node-tests/fixtures/helper-test/unit.js
index 1e02a440f39..21a56367d22 100644
--- a/node-tests/fixtures/helper-test/unit.js
+++ b/node-tests/fixtures/helper-test/unit.js
@@ -4,7 +4,7 @@ import { module, test } from 'qunit';
 
 module('Unit | Helper | foo/bar-baz');
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   let result = fooBarBaz([42]);
   assert.ok(result);
diff --git a/node-tests/fixtures/initializer-test/default.js b/node-tests/fixtures/initializer-test/default.js
index 362f4f6d2eb..29ab5d4ef1c 100644
--- a/node-tests/fixtures/initializer-test/default.js
+++ b/node-tests/fixtures/initializer-test/default.js
@@ -17,7 +17,7 @@ module('Unit | Initializer | foo', {
   }
 });
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   initialize(this.application);
 
diff --git a/node-tests/fixtures/initializer-test/dummy.js b/node-tests/fixtures/initializer-test/dummy.js
index 5777e3e8973..b48e96cece5 100644
--- a/node-tests/fixtures/initializer-test/dummy.js
+++ b/node-tests/fixtures/initializer-test/dummy.js
@@ -17,7 +17,7 @@ module('Unit | Initializer | foo', {
   }
 });
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   initialize(this.application);
 
diff --git a/node-tests/fixtures/initializer-test/mocha-rfc232.js b/node-tests/fixtures/initializer-test/mocha-rfc232.js
index ff65d7b91b5..ee2a5fb026d 100644
--- a/node-tests/fixtures/initializer-test/mocha-rfc232.js
+++ b/node-tests/fixtures/initializer-test/mocha-rfc232.js
@@ -19,7 +19,7 @@ describe('Unit | Initializer | foo', function() {
     run(this.application, 'destroy');
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', async function() {
     await this.application.boot();
 
diff --git a/node-tests/fixtures/initializer-test/mocha.js b/node-tests/fixtures/initializer-test/mocha.js
index 95daa82e159..a59442cc5ef 100644
--- a/node-tests/fixtures/initializer-test/mocha.js
+++ b/node-tests/fixtures/initializer-test/mocha.js
@@ -19,7 +19,7 @@ describe('Unit | Initializer | foo', function() {
     run(application, 'destroy');
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     initialize(application);
 
diff --git a/node-tests/fixtures/initializer-test/module-unification/default.js b/node-tests/fixtures/initializer-test/module-unification/default.js
index e07637d084d..24cbe31ebe0 100644
--- a/node-tests/fixtures/initializer-test/module-unification/default.js
+++ b/node-tests/fixtures/initializer-test/module-unification/default.js
@@ -17,7 +17,7 @@ module('Unit | Initializer | foo', {
   }
 });
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   initialize(this.application);
 
diff --git a/node-tests/fixtures/initializer-test/module-unification/dummy.js b/node-tests/fixtures/initializer-test/module-unification/dummy.js
index cb77e3343f8..6ef5db4cb45 100644
--- a/node-tests/fixtures/initializer-test/module-unification/dummy.js
+++ b/node-tests/fixtures/initializer-test/module-unification/dummy.js
@@ -17,7 +17,7 @@ module('Unit | Initializer | foo', {
   }
 });
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   initialize(this.application);
 
diff --git a/node-tests/fixtures/initializer-test/module-unification/mocha-rfc232.js b/node-tests/fixtures/initializer-test/module-unification/mocha-rfc232.js
index d850940d647..91fbb90f68e 100644
--- a/node-tests/fixtures/initializer-test/module-unification/mocha-rfc232.js
+++ b/node-tests/fixtures/initializer-test/module-unification/mocha-rfc232.js
@@ -19,7 +19,7 @@ describe('Unit | Initializer | foo', function() {
     run(this.application, 'destroy');
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', async function() {
     await this.application.boot();
 
diff --git a/node-tests/fixtures/initializer-test/module-unification/mocha.js b/node-tests/fixtures/initializer-test/module-unification/mocha.js
index 710cf179b2e..fddc49536fa 100644
--- a/node-tests/fixtures/initializer-test/module-unification/mocha.js
+++ b/node-tests/fixtures/initializer-test/module-unification/mocha.js
@@ -19,7 +19,7 @@ describe('Unit | Initializer | foo', function() {
     run(application, 'destroy');
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     initialize(application);
 
diff --git a/node-tests/fixtures/initializer-test/module-unification/rfc232.js b/node-tests/fixtures/initializer-test/module-unification/rfc232.js
index 5121a31a88c..04a51ea4d36 100644
--- a/node-tests/fixtures/initializer-test/module-unification/rfc232.js
+++ b/node-tests/fixtures/initializer-test/module-unification/rfc232.js
@@ -19,7 +19,7 @@ module('Unit | Initializer | foo', function(hooks) {
     run(this.application, 'destroy');
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   test('it works', async function(assert) {
     await this.application.boot();
 
diff --git a/node-tests/fixtures/initializer-test/rfc232.js b/node-tests/fixtures/initializer-test/rfc232.js
index b9acb221807..36dcdc6da27 100644
--- a/node-tests/fixtures/initializer-test/rfc232.js
+++ b/node-tests/fixtures/initializer-test/rfc232.js
@@ -19,7 +19,7 @@ module('Unit | Initializer | foo', function(hooks) {
     run(this.application, 'destroy');
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   test('it works', async function(assert) {
     await this.application.boot();
 
diff --git a/node-tests/fixtures/instance-initializer-test/default.js b/node-tests/fixtures/instance-initializer-test/default.js
index 52de0c7c8be..7c4bb90e57a 100644
--- a/node-tests/fixtures/instance-initializer-test/default.js
+++ b/node-tests/fixtures/instance-initializer-test/default.js
@@ -16,7 +16,7 @@ module('Unit | Instance Initializer | foo', {
   }
 });
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   initialize(this.appInstance);
 
diff --git a/node-tests/fixtures/instance-initializer-test/dummy.js b/node-tests/fixtures/instance-initializer-test/dummy.js
index 9b5fba7bda8..1ab4f1dbff0 100644
--- a/node-tests/fixtures/instance-initializer-test/dummy.js
+++ b/node-tests/fixtures/instance-initializer-test/dummy.js
@@ -16,7 +16,7 @@ module('Unit | Instance Initializer | foo', {
   }
 });
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   initialize(this.appInstance);
 
diff --git a/node-tests/fixtures/instance-initializer-test/mocha-rfc232.js b/node-tests/fixtures/instance-initializer-test/mocha-rfc232.js
index 9447560e6de..9c2702d5470 100644
--- a/node-tests/fixtures/instance-initializer-test/mocha-rfc232.js
+++ b/node-tests/fixtures/instance-initializer-test/mocha-rfc232.js
@@ -19,7 +19,7 @@ describe('Unit | Instance Initializer | foo', function() {
     run(this.application, 'destroy');
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', async function() {
     await this.instance.boot();
 
diff --git a/node-tests/fixtures/instance-initializer-test/mocha.js b/node-tests/fixtures/instance-initializer-test/mocha.js
index f06c6da0fb6..50dbe0a1c17 100644
--- a/node-tests/fixtures/instance-initializer-test/mocha.js
+++ b/node-tests/fixtures/instance-initializer-test/mocha.js
@@ -20,7 +20,7 @@ describe('Unit | Instance Initializer | foo', function() {
     destroyApp(application);
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     initialize(appInstance);
 
diff --git a/node-tests/fixtures/instance-initializer-test/module-unification/default.js b/node-tests/fixtures/instance-initializer-test/module-unification/default.js
index 3e2d2342483..3fb5614db4e 100644
--- a/node-tests/fixtures/instance-initializer-test/module-unification/default.js
+++ b/node-tests/fixtures/instance-initializer-test/module-unification/default.js
@@ -16,7 +16,7 @@ module('Unit | Instance Initializer | foo', {
   }
 });
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   initialize(this.appInstance);
 
diff --git a/node-tests/fixtures/instance-initializer-test/module-unification/dummy.js b/node-tests/fixtures/instance-initializer-test/module-unification/dummy.js
index 504c83a7d39..c8fe5b8ad4c 100644
--- a/node-tests/fixtures/instance-initializer-test/module-unification/dummy.js
+++ b/node-tests/fixtures/instance-initializer-test/module-unification/dummy.js
@@ -16,7 +16,7 @@ module('Unit | Instance Initializer | foo', {
   }
 });
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   initialize(this.appInstance);
 
diff --git a/node-tests/fixtures/instance-initializer-test/module-unification/mocha-rfc232.js b/node-tests/fixtures/instance-initializer-test/module-unification/mocha-rfc232.js
index 849828b0800..052dd2806c7 100644
--- a/node-tests/fixtures/instance-initializer-test/module-unification/mocha-rfc232.js
+++ b/node-tests/fixtures/instance-initializer-test/module-unification/mocha-rfc232.js
@@ -19,7 +19,7 @@ describe('Unit | Instance Initializer | foo', function() {
     run(this.application, 'destroy');
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', async function() {
     await this.instance.boot();
 
diff --git a/node-tests/fixtures/instance-initializer-test/module-unification/mocha.js b/node-tests/fixtures/instance-initializer-test/module-unification/mocha.js
index 0dcecef726f..a37bc43820c 100644
--- a/node-tests/fixtures/instance-initializer-test/module-unification/mocha.js
+++ b/node-tests/fixtures/instance-initializer-test/module-unification/mocha.js
@@ -20,7 +20,7 @@ describe('Unit | Instance Initializer | foo', function() {
     destroyApp(application);
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     initialize(appInstance);
 
diff --git a/node-tests/fixtures/instance-initializer-test/module-unification/rfc232.js b/node-tests/fixtures/instance-initializer-test/module-unification/rfc232.js
index 8a62c67574d..4c97d5f64bf 100644
--- a/node-tests/fixtures/instance-initializer-test/module-unification/rfc232.js
+++ b/node-tests/fixtures/instance-initializer-test/module-unification/rfc232.js
@@ -19,7 +19,7 @@ module('Unit | Instance Initializer | foo', function(hooks) {
     run(this.application, 'destroy');
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   test('it works', async function(assert) {
     await this.instance.boot();
 
diff --git a/node-tests/fixtures/instance-initializer-test/rfc232.js b/node-tests/fixtures/instance-initializer-test/rfc232.js
index 90cfb3bf37b..c6f693da2ce 100644
--- a/node-tests/fixtures/instance-initializer-test/rfc232.js
+++ b/node-tests/fixtures/instance-initializer-test/rfc232.js
@@ -19,7 +19,7 @@ module('Unit | Instance Initializer | foo', function(hooks) {
     run(this.application, 'destroy');
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   test('it works', async function(assert) {
     await this.instance.boot();
 
diff --git a/node-tests/fixtures/mixin-test/addon.js b/node-tests/fixtures/mixin-test/addon.js
index f38f4eaeaf4..da7da2da1fc 100644
--- a/node-tests/fixtures/mixin-test/addon.js
+++ b/node-tests/fixtures/mixin-test/addon.js
@@ -4,7 +4,7 @@ import { module, test } from 'qunit';
 
 module('Unit | Mixin | foo');
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   let FooObject = EmberObject.extend(FooMixin);
   let subject = FooObject.create();
diff --git a/node-tests/fixtures/mixin-test/default.js b/node-tests/fixtures/mixin-test/default.js
index 0ab03d90908..1880e85c7b4 100644
--- a/node-tests/fixtures/mixin-test/default.js
+++ b/node-tests/fixtures/mixin-test/default.js
@@ -4,7 +4,7 @@ import { module, test } from 'qunit';
 
 module('Unit | Mixin | foo');
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   let FooObject = EmberObject.extend(FooMixin);
   let subject = FooObject.create();
diff --git a/node-tests/fixtures/mixin-test/mocha-rfc232.js b/node-tests/fixtures/mixin-test/mocha-rfc232.js
index 6444f5768ab..449cd5d41b6 100644
--- a/node-tests/fixtures/mixin-test/mocha-rfc232.js
+++ b/node-tests/fixtures/mixin-test/mocha-rfc232.js
@@ -4,7 +4,7 @@ import EmberObject from '@ember/object';
 import FooMixin from 'my-app/mixins/foo';
 
 describe('Unit | Mixin | foo', function() {
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     let FooObject = EmberObject.extend(FooMixin);
     let subject = FooObject.create();
diff --git a/node-tests/fixtures/mixin-test/mocha.js b/node-tests/fixtures/mixin-test/mocha.js
index 6444f5768ab..449cd5d41b6 100644
--- a/node-tests/fixtures/mixin-test/mocha.js
+++ b/node-tests/fixtures/mixin-test/mocha.js
@@ -4,7 +4,7 @@ import EmberObject from '@ember/object';
 import FooMixin from 'my-app/mixins/foo';
 
 describe('Unit | Mixin | foo', function() {
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     let FooObject = EmberObject.extend(FooMixin);
     let subject = FooObject.create();
diff --git a/node-tests/fixtures/mixin-test/rfc232.js b/node-tests/fixtures/mixin-test/rfc232.js
index a2d41a5b5b0..2b76ff468a4 100644
--- a/node-tests/fixtures/mixin-test/rfc232.js
+++ b/node-tests/fixtures/mixin-test/rfc232.js
@@ -3,7 +3,7 @@ import FooMixin from 'my-app/mixins/foo';
 import { module, test } from 'qunit';
 
 module('Unit | Mixin | foo', function() {
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   test('it works', function (assert) {
     let FooObject = EmberObject.extend(FooMixin);
     let subject = FooObject.create();
diff --git a/node-tests/fixtures/service-test/default-nested.js b/node-tests/fixtures/service-test/default-nested.js
index a5f430ca9f2..a2acf7ea09d 100644
--- a/node-tests/fixtures/service-test/default-nested.js
+++ b/node-tests/fixtures/service-test/default-nested.js
@@ -5,7 +5,7 @@ moduleFor('service:foo/bar', 'Unit | Service | foo/bar', {
   // needs: ['service:foo']
 });
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it exists', function(assert) {
   let service = this.subject();
   assert.ok(service);
diff --git a/node-tests/fixtures/service-test/default.js b/node-tests/fixtures/service-test/default.js
index 7276305fbd4..2e5321ecd48 100644
--- a/node-tests/fixtures/service-test/default.js
+++ b/node-tests/fixtures/service-test/default.js
@@ -5,7 +5,7 @@ moduleFor('service:foo', 'Unit | Service | foo', {
   // needs: ['service:foo']
 });
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it exists', function(assert) {
   let service = this.subject();
   assert.ok(service);
diff --git a/node-tests/fixtures/service-test/mocha-0.12.js b/node-tests/fixtures/service-test/mocha-0.12.js
index bc9be90ad1e..bf2023f1f49 100644
--- a/node-tests/fixtures/service-test/mocha-0.12.js
+++ b/node-tests/fixtures/service-test/mocha-0.12.js
@@ -8,7 +8,7 @@ describe('Unit | Service | foo', function() {
     // needs: ['service:foo']
   });
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('exists', function() {
     let service = this.subject();
     expect(service).to.be.ok;
diff --git a/node-tests/fixtures/service-test/mocha-rfc232.js b/node-tests/fixtures/service-test/mocha-rfc232.js
index 7ef4837e045..65905b9e1ec 100644
--- a/node-tests/fixtures/service-test/mocha-rfc232.js
+++ b/node-tests/fixtures/service-test/mocha-rfc232.js
@@ -5,7 +5,7 @@ import { setupTest } from 'ember-mocha';
 describe('Unit | Service | foo', function() {
   setupTest();
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('exists', function() {
     let service = this.owner.lookup('service:foo');
     expect(service).to.be.ok;
diff --git a/node-tests/fixtures/service-test/mocha.js b/node-tests/fixtures/service-test/mocha.js
index 9fea1210511..f8909b0a8c2 100644
--- a/node-tests/fixtures/service-test/mocha.js
+++ b/node-tests/fixtures/service-test/mocha.js
@@ -7,7 +7,7 @@ describeModule('service:foo', 'Unit | Service | foo',
     // needs: ['service:foo']
   },
   function() {
-    // Replace this with your real tests.
+    // TODO: Replace this with your real tests.
     it('exists', function() {
       let service = this.subject();
       expect(service).to.be.ok;
diff --git a/node-tests/fixtures/service-test/rfc232.js b/node-tests/fixtures/service-test/rfc232.js
index 3fbd15bb04e..9d6efae3174 100644
--- a/node-tests/fixtures/service-test/rfc232.js
+++ b/node-tests/fixtures/service-test/rfc232.js
@@ -4,7 +4,7 @@ import { setupTest } from 'ember-qunit';
 module('Unit | Service | foo', function(hooks) {
   setupTest(hooks);
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   test('it exists', function(assert) {
     let service = this.owner.lookup('service:foo');
     assert.ok(service);
diff --git a/node-tests/fixtures/util-test/addon-default-nested.js b/node-tests/fixtures/util-test/addon-default-nested.js
index e721d6334e2..e1ffab78d16 100644
--- a/node-tests/fixtures/util-test/addon-default-nested.js
+++ b/node-tests/fixtures/util-test/addon-default-nested.js
@@ -3,7 +3,7 @@ import { module, test } from 'qunit';
 
 module('Unit | Utility | foo/bar-baz');
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   let result = fooBarBaz();
   assert.ok(result);
diff --git a/node-tests/fixtures/util-test/addon-default.js b/node-tests/fixtures/util-test/addon-default.js
index 0098f7a43cd..164b20ab8ff 100644
--- a/node-tests/fixtures/util-test/addon-default.js
+++ b/node-tests/fixtures/util-test/addon-default.js
@@ -3,7 +3,7 @@ import { module, test } from 'qunit';
 
 module('Unit | Utility | foo-bar');
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   let result = fooBar();
   assert.ok(result);
diff --git a/node-tests/fixtures/util-test/default-nested.js b/node-tests/fixtures/util-test/default-nested.js
index 86e4b5d82ab..9688d485e6e 100644
--- a/node-tests/fixtures/util-test/default-nested.js
+++ b/node-tests/fixtures/util-test/default-nested.js
@@ -3,7 +3,7 @@ import { module, test } from 'qunit';
 
 module('Unit | Utility | foo/bar-baz');
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   let result = fooBarBaz();
   assert.ok(result);
diff --git a/node-tests/fixtures/util-test/default.js b/node-tests/fixtures/util-test/default.js
index 94218c6f700..44ccfaa7f2d 100644
--- a/node-tests/fixtures/util-test/default.js
+++ b/node-tests/fixtures/util-test/default.js
@@ -3,7 +3,7 @@ import { module, test } from 'qunit';
 
 module('Unit | Utility | foo-bar');
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   let result = fooBar();
   assert.ok(result);
diff --git a/node-tests/fixtures/util-test/dummy.js b/node-tests/fixtures/util-test/dummy.js
index 0098f7a43cd..164b20ab8ff 100644
--- a/node-tests/fixtures/util-test/dummy.js
+++ b/node-tests/fixtures/util-test/dummy.js
@@ -3,7 +3,7 @@ import { module, test } from 'qunit';
 
 module('Unit | Utility | foo-bar');
 
-// Replace this with your real tests.
+// TODO: Replace this with your real tests.
 test('it works', function(assert) {
   let result = fooBar();
   assert.ok(result);
diff --git a/node-tests/fixtures/util-test/mocha-rfc232.js b/node-tests/fixtures/util-test/mocha-rfc232.js
index 655e717431e..d99ec534e41 100644
--- a/node-tests/fixtures/util-test/mocha-rfc232.js
+++ b/node-tests/fixtures/util-test/mocha-rfc232.js
@@ -3,7 +3,7 @@ import { describe, it } from 'mocha';
 import fooBar from 'my-app/utils/foo-bar';
 
 describe('Unit | Utility | foo-bar', function() {
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     let result = fooBar();
     expect(result).to.be.ok;
diff --git a/node-tests/fixtures/util-test/mocha.js b/node-tests/fixtures/util-test/mocha.js
index 655e717431e..d99ec534e41 100644
--- a/node-tests/fixtures/util-test/mocha.js
+++ b/node-tests/fixtures/util-test/mocha.js
@@ -3,7 +3,7 @@ import { describe, it } from 'mocha';
 import fooBar from 'my-app/utils/foo-bar';
 
 describe('Unit | Utility | foo-bar', function() {
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   it('works', function() {
     let result = fooBar();
     expect(result).to.be.ok;
diff --git a/node-tests/fixtures/util-test/rfc232.js b/node-tests/fixtures/util-test/rfc232.js
index b13add8dbfc..45a0a808ffc 100644
--- a/node-tests/fixtures/util-test/rfc232.js
+++ b/node-tests/fixtures/util-test/rfc232.js
@@ -3,7 +3,7 @@ import { module, test } from 'qunit';
 
 module('Unit | Utility | foo-bar', function() {
 
-  // Replace this with your real tests.
+  // TODO: Replace this with your real tests.
   test('it works', function(assert) {
     let result = fooBar();
     assert.ok(result);