diff --git a/ui/core/mirage/scenarios/default.js b/ui/core/mirage/scenarios/default.js
index f5727e195..7bc409465 100644
--- a/ui/core/mirage/scenarios/default.js
+++ b/ui/core/mirage/scenarios/default.js
@@ -3,10 +3,10 @@ export default function(server) {
   // Scope resources
 
   const globalScope = server.create('scope', { id: 'global' });  // creates a global scope
-  const orgScope = server.create('scope', {
+  const orgScope = server.createList('scope', 3, {
     type: 'org',
     scope: { id: globalScope.id, type: globalScope.type }
-  }, 'withChildren');
+  }, 'withChildren')[0];
   const scope = { id: orgScope.id, type: orgScope.type };
 
   // Auth
diff --git a/ui/core/tests/acceptance/host-catalogs-test.js b/ui/core/tests/acceptance/host-catalogs-test.js
index 682f9c163..96b49cd8c 100644
--- a/ui/core/tests/acceptance/host-catalogs-test.js
+++ b/ui/core/tests/acceptance/host-catalogs-test.js
@@ -5,9 +5,10 @@ import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
 import a11yAudit from 'ember-a11y-testing/test-support/audit';
 import { Response } from 'miragejs';
 import {
-//  currentSession,
   authenticateSession,
-//  invalidateSession,
+  // These are left here intentionally for future reference.
+  //currentSession,
+  //invalidateSession,
 } from 'ember-simple-auth/test-support';
 
 module('Acceptance | host catalogs', function(hooks) {