diff --git a/public/modules/forms/tests/unit/directives/on-finish-render.client.directive.test.js b/public/modules/forms/tests/unit/directives/on-finish-render.client.directive.test.js
index 188022c4..9f48ab6a 100644
--- a/public/modules/forms/tests/unit/directives/on-finish-render.client.directive.test.js
+++ b/public/modules/forms/tests/unit/directives/on-finish-render.client.directive.test.js
@@ -4,15 +4,73 @@
     // Forms Controller Spec
     describe('onFinishRender Directive Tests', function() {
         // Initialize global variables
-        var scope,
-            FormFields;
+        var scope;
+
+        var FormFields = {
+            types: [
+                {
+                    name : 'textfield',
+                    value : 'Short Text'
+                },
+                {
+                    name : 'email',
+                    value : 'Email'
+                },
+                {
+                    name : 'radio',
+                    value : 'Muliple Choice'
+                },
+                {
+                    name : 'dropdown',
+                    value : 'Dropdown'
+                },
+                {
+                    name : 'date',
+                    value : 'Date'
+                },
+                {
+                    name : 'textarea',
+                    value : 'Paragraph',
+                },
+                {
+                    name : 'yes_no',
+                    value : 'Yes/No',
+                },
+                {
+                    name : 'legal',
+                    value : 'Legal',
+                },
+                {
+                    name : 'rating',
+                    value : 'Rating',
+                },
+                {
+                    name : 'link',
+                    value : 'Link',
+                },
+                {
+                    name : 'number',
+                    value : 'Numbers',
+                },
+                {
+                    name : 'statement',
+                    value : 'Statement'
+                }
+            ]
+        };
 
         // Load the main application module
         beforeEach(module(ApplicationConfiguration.applicationModuleName));
 
-        beforeEach(inject(function ($rootScope, _FormFields_) {
+        //Mock FormFields Service
+        beforeEach(module(function($provide) {
+            $provide.service('FormFields', function() {
+                return FormFields;
+            });
+        }));
+
+        beforeEach(inject(function ($rootScope) {
             scope = $rootScope.$new();
-            FormFields = _FormFields_;
             spyOn($rootScope, '$broadcast');
 
         }));