diff --git a/angular-wizard/angular-wizard-tests.ts b/angular-wizard/angular-wizard-tests.ts
index fb20c52c58..61ad7a4843 100644
--- a/angular-wizard/angular-wizard-tests.ts
+++ b/angular-wizard/angular-wizard-tests.ts
@@ -1,220 +1,218 @@
 /// <reference path="../jasmine/jasmine.d.ts" />
-/// <reference path="../jasmine-jquery/jasmine-jquery.d.ts" />
-/// <reference path="../angularjs/angular-mocks.d.ts" />
+/// <reference path="../angularjs/angular.d.ts" />
+
 /// <reference path="angular-wizard.d.ts" />
 
 // test file taken from https://github.com/mgonto/angular-wizard
 
-declare module ng.mgoAngularWizard {
-  "use strict";
 
-  describe( 'AngularWizard', function() {
-    var $compile, $rootScope, WizardHandler:ng.mgoAngularWizard.WizardHandler, scope;
+interface WizardScope extends ng.IScope {
+    referenceCurrentStep:string;
+    stepValidation:()=>void;
+    finishedWizard:()=>void;
+    enterValidation:()=>void;
+}
 
-    beforeEach(module('mgo-angular-wizard'));
-
-
-    beforeEach(inject(function(_$compile_, _$rootScope_, _WizardHandler_) {
-      $compile = _$compile_;
-      $rootScope = _$rootScope_;
-      WizardHandler = _WizardHandler_;
-      scope = $rootScope.$new();
-    }));
+describe('AngularWizard', function () {
+    var $compile:ng.ICompileService,
+        $rootScope:ng.IRootScopeService, WizardHandler:angular.mgoAngularWizard.WizardHandler, scope:WizardScope;
 
     /**
      * Create the view with wizard to test
      * @param  {Scope} scope         A scope to bind to
      * @return {[DOM element]}       A DOM element compiled
      */
-    function createView(scope) {
-      scope.referenceCurrentStep = null;
-      var element = angular.element('<wizard on-finish="finishedWizard()" current-step="referenceCurrentStep" ng-init="msg = 14" >'
-      + '    <wz-step title="Starting" canenter="enterValidation">'
-      + '        <h1>This is the first step</h1>'
-      + '        <p>Here you can use whatever you want. You can use other directives, binding, etc.</p>'
-      + '        <input type="submit" wz-next value="Continue" />'
-      + '    </wz-step>'
-      + '    <wz-step title="Continuing" canexit="stepValidation">'
-      + '        <h1>Continuing</h1>'
-      + '        <p>You have continued here!</p>'
-      + '        <input type="submit" wz-next value="Go on" />'
-      + '    </wz-step>'
-      + '    <wz-step title="More steps" canenter="enterValidation">'
-      + '        <p>Even more steps!!</p>'
-      + '        <input type="submit" wz-next value="Finish now" />'
-      + '    </wz-step>'
-      + '</wizard>');
-      var elementCompiled = $compile(element)(scope);
-      $rootScope.$digest();
-      return elementCompiled;
+    function createView(scope:WizardScope) {
+        scope.referenceCurrentStep = null;
+        var element = angular.element('<wizard on-finish="finishedWizard()" current-step="referenceCurrentStep" ng-init="msg = 14" >'
+        + '    <wz-step title="Starting" canenter="enterValidation">'
+        + '        <h1>This is the first step</h1>'
+        + '        <p>Here you can use whatever you want. You can use other directives, binding, etc.</p>'
+        + '        <input type="submit" wz-next value="Continue" />'
+        + '    </wz-step>'
+        + '    <wz-step title="Continuing" canexit="stepValidation">'
+        + '        <h1>Continuing</h1>'
+        + '        <p>You have continued here!</p>'
+        + '        <input type="submit" wz-next value="Go on" />'
+        + '    </wz-step>'
+        + '    <wz-step title="More steps" canenter="enterValidation">'
+        + '        <p>Even more steps!!</p>'
+        + '        <input type="submit" wz-next value="Finish now" />'
+        + '    </wz-step>'
+        + '</wizard>');
+        var elementCompiled = $compile(element)(scope);
+        $rootScope.$digest();
+        return elementCompiled;
     }
 
-    it("should correctly create the wizard", function() {
-      var view = createView(scope);
-      expect(WizardHandler).toBeTruthy();
-      expect(view.find('section').length).toEqual(3);
-      // expect the correct step to be desirable one
-      expect(scope.referenceCurrentStep).toEqual('Starting');
+    it("should correctly create the wizard", function () {
+        var view = createView(scope);
+        expect(WizardHandler).toBeTruthy();
+        expect(view.find('section').length).toEqual(3);
+        // expect the correct step to be desirable one
+        expect(scope.referenceCurrentStep).toEqual('Starting');
     });
 
-    it( "should go to the next step", function() {
-      var view = createView(scope);
-      expect(scope.referenceCurrentStep).toEqual('Starting');
-      WizardHandler.wizard().next();
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('Continuing');
+    it("should go to the next step", function () {
+        var view = createView(scope);
+        expect(scope.referenceCurrentStep).toEqual('Starting');
+        WizardHandler.wizard().next();
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('Continuing');
     });
-    it( "should return to a previous step", function() {
-      
-      var view = createView(scope);
-      expect(scope.referenceCurrentStep).toEqual('Starting');
-      WizardHandler.wizard().next();
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('Continuing');
-      WizardHandler.wizard().previous();
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('Starting');
+    it("should return to a previous step", function () {
+
+        var view = createView(scope);
+        expect(scope.referenceCurrentStep).toEqual('Starting');
+        WizardHandler.wizard().next();
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('Continuing');
+        WizardHandler.wizard().previous();
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('Starting');
     });
-    it( "should go to a step specified by name", function() {
-      
-      var view = createView(scope);
-      expect(scope.referenceCurrentStep).toEqual('Starting');
-      WizardHandler.wizard().goTo('More steps');
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('More steps');
+    it("should go to a step specified by name", function () {
+
+        var view = createView(scope);
+        expect(scope.referenceCurrentStep).toEqual('Starting');
+        WizardHandler.wizard().goTo('More steps');
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('More steps');
     });
-    it( "should go to a step specified by index", function() {
-      
-      var view = createView(scope);
-      expect(scope.referenceCurrentStep).toEqual('Starting');
-      WizardHandler.wizard().goTo(2);
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('More steps');
+    it("should go to a step specified by index", function () {
+
+        var view = createView(scope);
+        expect(scope.referenceCurrentStep).toEqual('Starting');
+        WizardHandler.wizard().goTo(2);
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('More steps');
     });
-    it( "should go to next step becasue callback is truthy", function() {
-      
-      var view = createView(scope);
-      expect(scope.referenceCurrentStep).toEqual('Starting');
-      WizardHandler.wizard().next(function(){
-        return true
-      });
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('Continuing');
+    it("should go to next step becasue callback is truthy", function () {
+
+        var view = createView(scope);
+        expect(scope.referenceCurrentStep).toEqual('Starting');
+        WizardHandler.wizard().next(function () {
+            return true
+        });
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('Continuing');
     });
-    it( "should NOT go to next step because callback is falsey", function() {
-      
-      var view = createView(scope);
-      expect(scope.referenceCurrentStep).toEqual('Starting');
-      WizardHandler.wizard().next(function(){
-        return false
-      });
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('Starting');
+    it("should NOT go to next step because callback is falsey", function () {
+
+        var view = createView(scope);
+        expect(scope.referenceCurrentStep).toEqual('Starting');
+        WizardHandler.wizard().next(function () {
+            return false
+        });
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('Starting');
     });
-    it( "should go to next step because CANEXIT is UNDEFINED", function() {
-      
-      var view = createView(scope);
-      expect(scope.referenceCurrentStep).toEqual('Starting');
-      WizardHandler.wizard().next();
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('Continuing');
+    it("should go to next step because CANEXIT is UNDEFINED", function () {
+
+        var view = createView(scope);
+        expect(scope.referenceCurrentStep).toEqual('Starting');
+        WizardHandler.wizard().next();
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('Continuing');
     });
-    it( "should go to next step because CANEXIT is TRUE", function() {
-      
-      var view = createView(scope);
-      scope.stepValidation = function(){
-        return true;
-      };
-      expect(scope.referenceCurrentStep).toEqual('Starting');
-      WizardHandler.wizard().next();
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('Continuing');
-      WizardHandler.wizard().next();
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('More steps');
+    it("should go to next step because CANEXIT is TRUE", function () {
+
+        var view = createView(scope);
+        scope.stepValidation = function () {
+            return true;
+        };
+        expect(scope.referenceCurrentStep).toEqual('Starting');
+        WizardHandler.wizard().next();
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('Continuing');
+        WizardHandler.wizard().next();
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('More steps');
     });
-    it( "should NOT go to next step because CANEXIT is FALSE", function() {
-      
-      var view = createView(scope);
-      scope.stepValidation = function(){
-        return false;
-      };
-      expect(scope.referenceCurrentStep).toEqual('Starting');
-      WizardHandler.wizard().next();
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('Continuing');
-      WizardHandler.wizard().next();
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('Continuing');
+    it("should NOT go to next step because CANEXIT is FALSE", function () {
+
+        var view = createView(scope);
+        scope.stepValidation = function () {
+            return false;
+        };
+        expect(scope.referenceCurrentStep).toEqual('Starting');
+        WizardHandler.wizard().next();
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('Continuing');
+        WizardHandler.wizard().next();
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('Continuing');
     });
-    it( "should go to next step because CANENTER is TRUE", function() {
-      
-      var view = createView(scope);
-      scope.enterValidation = function(){
-        return true;
-      };
-      expect(scope.referenceCurrentStep).toEqual('Starting');
-      WizardHandler.wizard().next();
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('Continuing');
-      WizardHandler.wizard().next();
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('More steps');
+    it("should go to next step because CANENTER is TRUE", function () {
+
+        var view = createView(scope);
+        scope.enterValidation = function () {
+            return true;
+        };
+        expect(scope.referenceCurrentStep).toEqual('Starting');
+        WizardHandler.wizard().next();
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('Continuing');
+        WizardHandler.wizard().next();
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('More steps');
     });
-    it( "should NOT go to next step because CANENTER is FALSE", function() {
-      
-      var view = createView(scope);
-      scope.enterValidation = function(){
-        return false;
-      };
-      expect(scope.referenceCurrentStep).toEqual('Starting');
-      WizardHandler.wizard().next();
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('Continuing');
-      WizardHandler.wizard().next();
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('Continuing');
+    it("should NOT go to next step because CANENTER is FALSE", function () {
+
+        var view = createView(scope);
+        scope.enterValidation = function () {
+            return false;
+        };
+        expect(scope.referenceCurrentStep).toEqual('Starting');
+        WizardHandler.wizard().next();
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('Continuing');
+        WizardHandler.wizard().next();
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('Continuing');
     });
-    it( "should NOT return to a previous step. Although CANEXIT is false and we are heading to a previous state, the can enter validation is false", function() {
-      
-      var view = createView(scope);
-      scope.stepValidation = function(){
-        return false;
-      };
-      scope.enterValidation = function(){
-        return false;
-      };
-      expect(scope.referenceCurrentStep).toEqual('Starting');
-      WizardHandler.wizard().next();
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('Continuing');
-      WizardHandler.wizard().previous();
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('Continuing');
+    it("should NOT return to a previous step. Although CANEXIT is false and we are heading to a previous state, the can enter validation is false", function () {
+
+        var view = createView(scope);
+        scope.stepValidation = function () {
+            return false;
+        };
+        scope.enterValidation = function () {
+            return false;
+        };
+        expect(scope.referenceCurrentStep).toEqual('Starting');
+        WizardHandler.wizard().next();
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('Continuing');
+        WizardHandler.wizard().previous();
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('Continuing');
     });
-    it( "should return to a previous step even though CANEXIT is false", function() {
-      
-      var view = createView(scope);
-      scope.stepValidation = function(){
-        return false;
-      };
-      expect(scope.referenceCurrentStep).toEqual('Starting');
-      WizardHandler.wizard().next();
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('Continuing');
-      WizardHandler.wizard().previous();
-      $rootScope.$digest();
-      expect(scope.referenceCurrentStep).toEqual('Starting');
+    it("should return to a previous step even though CANEXIT is false", function () {
+
+        var view = createView(scope);
+        scope.stepValidation = function () {
+            return false;
+        };
+        expect(scope.referenceCurrentStep).toEqual('Starting');
+        WizardHandler.wizard().next();
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('Continuing');
+        WizardHandler.wizard().previous();
+        $rootScope.$digest();
+        expect(scope.referenceCurrentStep).toEqual('Starting');
     });
-    it( "should finish", function() {
-      
-      var flag = false;
-      scope.finishedWizard = function() { flag = true; };
-      var view = createView(scope);
-      expect(scope.referenceCurrentStep).toEqual('Starting');
-      WizardHandler.wizard().finish();
-      expect(flag).toBeTruthy();
-      $rootScope.$digest();
+    it("should finish", function () {
+
+        var flag = false;
+        scope.finishedWizard = function () {
+            flag = true;
+        };
+        var view = createView(scope);
+        expect(scope.referenceCurrentStep).toEqual('Starting');
+        WizardHandler.wizard().finish();
+        expect(flag).toBeTruthy();
+        $rootScope.$digest();
     });
-  });
-}
+});
+
diff --git a/angular-wizard/angular-wizard.d.ts b/angular-wizard/angular-wizard.d.ts
index cc41ff9c4a..f079a46c24 100644
--- a/angular-wizard/angular-wizard.d.ts
+++ b/angular-wizard/angular-wizard.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Marko Jurisic <https://github.com/mjurisic>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-declare module ng.mgoAngularWizard {
+declare module angular.mgoAngularWizard {
   interface WizardHandler {
     wizard(name?:string): Wizard;
     addWizard(name:string, wizard:Wizard):void;