diff --git a/test/main.js b/test/main.js
index 58de82bc3..c470e9190 100644
--- a/test/main.js
+++ b/test/main.js
@@ -24,4 +24,5 @@ describe('Main', () => {
   require(`${path}selector_manager`);
   require(`${path}storage_manager`);
   require(`${path}style_manager`);
+  require(`${path}trait_manager`);
 });
diff --git a/test/specs/trait_manager/index.js b/test/specs/trait_manager/index.js
new file mode 100644
index 000000000..cbcdbed20
--- /dev/null
+++ b/test/specs/trait_manager/index.js
@@ -0,0 +1,23 @@
+const TraitManager = require('trait_manager');
+const TraitsModel = require('./model/TraitsModel');
+const TraitsView = require('./view/TraitsView');
+
+describe('TraitManager', () => {
+
+  describe('Main', () => {
+
+    var obj;
+
+    beforeEach(() => {
+      obj = new TraitManager().init();
+    });
+
+    afterEach(() => {
+      obj = null;
+    });
+
+  });
+
+  TraitsModel.run();
+  TraitsView.run();
+});
diff --git a/test/specs/trait_manager/main.js b/test/specs/trait_manager/main.js
deleted file mode 100644
index 92145e456..000000000
--- a/test/specs/trait_manager/main.js
+++ /dev/null
@@ -1,25 +0,0 @@
-define(function(require, exports, module){
-  'use strict';
-  var TraitManager = require('TraitManager');
-  var TraitsView = require('undefined');
-
-    describe('TraitManager', function() {
-
-      describe('Main', function() {
-
-        var obj;
-
-        beforeEach(function () {
-          obj = new TraitManager().init();
-        });
-
-        afterEach(function () {
-          delete obj;
-        });
-
-      });
-
-      TraitsModel.run();
-      TraitsView.run();
-    });
-});
\ No newline at end of file
diff --git a/test/specs/trait_manager/model/TraitsModel.js b/test/specs/trait_manager/model/TraitsModel.js
index 0149dbae5..48c4dd545 100644
--- a/test/specs/trait_manager/model/TraitsModel.js
+++ b/test/specs/trait_manager/model/TraitsModel.js
@@ -1,34 +1,31 @@
-define(function(require, exports, module){
-  'use strict';
-  var Trait = require('TraitManager/model/Trait');
-  var Component = require('DomComponents/model/Component');
+const Trait = require('trait_manager/model/Trait');
+const Component = require('dom_components/model/Component');
 
-		module.exports = {
-			run: function(){
+module.exports = {
+  run() {
 
-				describe('TraitModels', function() {
+    describe('TraitModels', () => {
 
-          var obj;
-					var target;
-					var modelName = 'title';
+      var obj;
+      var target;
+      var modelName = 'title';
 
-          beforeEach(function () {
-						target = new Component();
-            obj = new Trait({
-							name: modelName,
-							target: target,
-						});
-          });
+      beforeEach(() => {
+        target = new Component();
+        obj = new Trait({
+          name: modelName,
+          target,
+        });
+      });
 
-          afterEach(function () {
-            delete obj;
-          });
+      afterEach(() => {
+        obj = null;
+      });
 
-					it('Object exists', function() {
-						Trait.should.be.exist;
-					});
+      it('Object exists', () => {
+        expect(Trait).toExist();
+      });
 
-				});
-			}
-		}
-});
\ No newline at end of file
+    });
+  }
+}
diff --git a/test/specs/trait_manager/view/TraitsView.js b/test/specs/trait_manager/view/TraitsView.js
index 261376662..488c21a74 100644
--- a/test/specs/trait_manager/view/TraitsView.js
+++ b/test/specs/trait_manager/view/TraitsView.js
@@ -1,75 +1,73 @@
-define(function(require, exports, module){
-  'use strict';
-  var Trait = require('undefined');
-  var Component = require('DomComponents/model/Component');
+const Trait = require('trait_manager/model/Trait');
+const TraitView = require('trait_manager/view/TraitView');
+const Component = require('dom_components/model/Component');
 
-		module.exports = {
-			run: function(){
+module.exports = {
+  run() {
 
-				describe('TraitView', function() {
+    describe('TraitView', () => {
 
-          var obj;
-					var model;
-					var modelName = 'title';
-					var target;
+      var obj;
+      var model;
+      var modelName = 'title';
+      var target;
 
-          beforeEach(function () {
-						target = new Component();
-						model = new Trait({
-							name: modelName,
-							target: target,
-						});
-            obj = new TraitView({
-							model: model,
-						});
-          });
+      beforeEach(() => {
+        target = new Component();
+        model = new Trait({
+          name: modelName,
+          target,
+        });
+        obj = new TraitView({
+          model,
+        });
+      });
 
-          afterEach(function () {
-            delete obj;
-						delete model;
-						delete target;
-          });
+      afterEach(() => {
+        obj = null;
+        model = null;
+        target = null;
+      });
 
-					it('Object exists', function() {
-						Trait.should.be.exist;
-					});
+      it('Object exists', () => {
+        expect(Trait).toExist();
+      });
 
-					it('Target has no attributes on init', function() {
-						target.get('attributes').should.deep.equal({});
-					});
+      it('Target has no attributes on init', () => {
+        expect(target.get('attributes')).toEqual({});
+      });
 
-					it('On update of the value updates the target attributes', function() {
-						model.set('value', 'test');
-						var eq = {};
-						eq[modelName] = 'test';
-						target.get('attributes').should.deep.equal(eq);
-					});
+      it('On update of the value updates the target attributes', () => {
+        model.set('value', 'test');
+        var eq = {};
+        eq[modelName] = 'test';
+        expect(target.get('attributes')).toEqual(eq);
+      });
 
-					it('Updates on different models do not alter other targets', function() {
-						var target1 = new Component();
-						var target2 = new Component();
-						var model1 = new Trait({
-							name: modelName,
-							target: target1,
-						});
-						var model2 = new Trait({
-							name: modelName,
-							target: target2,
-						});
-						var obj1 = new TraitView({model: model1});
-						var obj2 = new TraitView({model: model2});
+      it('Updates on different models do not alter other targets', () => {
+        var target1 = new Component();
+        var target2 = new Component();
+        var model1 = new Trait({
+          name: modelName,
+          target: target1,
+        });
+        var model2 = new Trait({
+          name: modelName,
+          target: target2,
+        });
+        var obj1 = new TraitView({model: model1});
+        var obj2 = new TraitView({model: model2});
 
-						model1.set('value', 'test1');
-						model2.set('value', 'test2');
-						var eq1 = {};
-						eq1[modelName] = 'test1';
-						var eq2 = {};
-						eq2[modelName] = 'test2';
-						target1.get('attributes').should.deep.equal(eq1);
-						target2.get('attributes').should.deep.equal(eq2);
-					});
+        model1.set('value', 'test1');
+        model2.set('value', 'test2');
+        var eq1 = {};
+        eq1[modelName] = 'test1';
+        var eq2 = {};
+        eq2[modelName] = 'test2';
+        expect(target1.get('attributes')).toEqual(eq1);
+        expect(target2.get('attributes')).toEqual(eq2);
+      });
 
-				});
-			}
-		}
-});
\ No newline at end of file
+    });
+  }
+}
diff --git a/test/specs/utils/main.js b/test/specs/utils/main.js
index f0d351f8b..aa4a5f346 100644
--- a/test/specs/utils/main.js
+++ b/test/specs/utils/main.js
@@ -1,9 +1,9 @@
-define(function(require, exports, module){
+define((require, exports, module) => {
   'use strict';
   var Utils = require('Utils');
   var Sorter = require('undefined');
 
-    describe('Utils', function() {
+    describe('Utils', () => {
 
       Sorter.run();