diff --git a/wherehows-web/mirage/factories/dataset.js b/wherehows-web/mirage/factories/dataset.js
index fdfc7d1804..a9fbd25d72 100644
--- a/wherehows-web/mirage/factories/dataset.js
+++ b/wherehows-web/mirage/factories/dataset.js
@@ -1,5 +1,5 @@
 import { Factory, faker, trait } from 'ember-cli-mirage';
-import { testSchemaA } from '../data/schema';
+import { testSchemaA } from 'wherehows-web/mirage/data/schema';
 
 export default Factory.extend({
   id: faker.random.number({ min: 10000, max: 20000 }),
diff --git a/wherehows-web/tests/helpers/setup-mirage.js b/wherehows-web/tests/helpers/setup-mirage.js
deleted file mode 100644
index 176fe81b12..0000000000
--- a/wherehows-web/tests/helpers/setup-mirage.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import mirageInitializer from 'wherehows-web/initializers/ember-cli-mirage';
-
-export default function startMirage(container) {
-  mirageInitializer.initialize(container);
-}
diff --git a/wherehows-web/tests/unit/utils/datasets/create-search-entries-test.js b/wherehows-web/tests/unit/utils/datasets/create-search-entries-test.js
index 8a07d1594d..fa0a3ee66f 100644
--- a/wherehows-web/tests/unit/utils/datasets/create-search-entries-test.js
+++ b/wherehows-web/tests/unit/utils/datasets/create-search-entries-test.js
@@ -1,37 +1,34 @@
-import datasetsCreateSearchEntries from 'wherehows-web/utils/datasets/create-search-entries';
 import { module, test } from 'qunit';
-import startMirage from 'wherehows-web/tests/helpers/setup-mirage';
+import { startMirage } from 'wherehows-web/initializers/ember-cli-mirage';
+import datasetsCreateSearchEntries from 'wherehows-web/utils/datasets/create-search-entries';
 import { testSchemaA } from 'wherehows-web/mirage/data/schema';
 
 module('Unit | Utility | datasets/create search entries', {
   beforeEach() {
-    startMirage(this.container);
+    this.server = startMirage();
   },
   afterEach() {
-    window.server.shutdown();
+    this.server.shutdown();
   }
 });
 
 test('it works base case', function(assert) {
-  const server = window.server;
-  const model = server.createList('dataset', 1, 'forUnitTests');
-  const dataset = model[0];
+  const { server } = this;
+  const dataset = server.create('dataset', 'forUnitTests');
 
-  let result = datasetsCreateSearchEntries([]);
+  const result = datasetsCreateSearchEntries([]);
   assert.ok(!result, 'Returns without error for nothing case');
 
-  result = datasetsCreateSearchEntries(model);
+  datasetsCreateSearchEntries([dataset]);
   assert.equal(dataset.id, 0, 'Sanity check: Created model successfully');
-  assert.equal(dataset.originalSchema, testSchemaA, 'Preserves original schema properly');
   assert.equal(dataset.schema, testSchemaA.slice(0, 499), 'Partial schema from beginning if no keyword found');
 });
 
 test('it works for keyword cases', function(assert) {
-  const server = window.server;
-  const model = server.createList('dataset', 1, 'forUnitTests');
-  const dataset = model[0];
+  const { server } = this;
+  const dataset = server.create('dataset', 'forUnitTests');
 
-  let result = datasetsCreateSearchEntries(model, 'Rebel');
+  datasetsCreateSearchEntries([dataset], 'Rebel');
   assert.equal(dataset.id, 0, 'Sanity check: Created model successfully again');
   assert.equal(dataset.schema, testSchemaA.slice(29, 529), 'Partial schema starts from keyword index');
 });