diff --git a/tests/unit/controllers/strains/show-test.js b/tests/unit/controllers/strains/show-test.js
new file mode 100644
index 0000000..9808fa5
--- /dev/null
+++ b/tests/unit/controllers/strains/show-test.js
@@ -0,0 +1,15 @@
+import {
+  moduleFor,
+  test
+} from 'ember-qunit';
+
+moduleFor('controller:strains/show', {
+  // Specify the other units that are required for this test.
+  // needs: ['controller:foo']
+});
+
+// Replace this with your real tests.
+test('it exists', function(assert) {
+  var controller = this.subject();
+  assert.ok(controller);
+});
diff --git a/tests/unit/initializers/custom-session-test.js b/tests/unit/initializers/custom-session-test.js
deleted file mode 100644
index a447736..0000000
--- a/tests/unit/initializers/custom-session-test.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import Ember from 'ember';
-import { initialize } from '../../../initializers/custom-session';
-import { module, test } from 'qunit';
-
-var container, application;
-
-module('CustomSessionInitializer', {
-  beforeEach: function() {
-    Ember.run(function() {
-      application = Ember.Application.create();
-      container = application.__container__;
-      application.deferReadiness();
-    });
-  }
-});
-
-// Replace this with your real tests.
-test('it works', function(assert) {
-  initialize(container, application);
-
-  // you would normally confirm the results of the initializer here
-  assert.ok(true);
-});
diff --git a/tests/unit/models/characteristic-test.js b/tests/unit/models/characteristic-test.js
index 6445fbb..c9d9263 100644
--- a/tests/unit/models/characteristic-test.js
+++ b/tests/unit/models/characteristic-test.js
@@ -5,7 +5,7 @@ import {
 
 moduleForModel('characteristic', {
   // Specify the other units that are required for this test.
-  needs: []
+  needs: ['model:measurement', 'model:strain']
 });
 
 test('it exists', function(assert) {
diff --git a/tests/unit/models/measurement-test.js b/tests/unit/models/measurement-test.js
index e2bed8e..0548082 100644
--- a/tests/unit/models/measurement-test.js
+++ b/tests/unit/models/measurement-test.js
@@ -5,7 +5,7 @@ import {
 
 moduleForModel('measurement', {
   // Specify the other units that are required for this test.
-  needs: []
+  needs: ['model:strain']
 });
 
 test('it exists', function(assert) {
diff --git a/tests/unit/models/strain-test.js b/tests/unit/models/strain-test.js
index 367229c..30b1e2c 100644
--- a/tests/unit/models/strain-test.js
+++ b/tests/unit/models/strain-test.js
@@ -5,7 +5,7 @@ import {
 
 moduleForModel('strain', {
   // Specify the other units that are required for this test.
-  needs: []
+  needs: ['model:measurement']
 });
 
 test('it exists', function(assert) {