diff --git a/components/input/Input.js b/components/input/Input.js
index 545fe8d3..9d3216be 100644
--- a/components/input/Input.js
+++ b/components/input/Input.js
@@ -225,6 +225,6 @@ const factory = (FontIcon) => {
 };
 
 const Input = factory(InjectedFontIcon);
-export default themr(INPUT, null, { withRef: true })(Input);
+export default themr(INPUT)(Input);
 export { factory as inputFactory };
 export { Input };
diff --git a/gulpfile.js b/gulpfile.js
index c447b5eb..57267e61 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -6,7 +6,8 @@ const postcss = require('gulp-postcss');
 gulp.task('js', function () {
   return gulp.src([
     './components/**/*.js',
-    '!./components/**/__test__/*.js',
+    '!./components/**/*.spec.js',
+    '!./components/**/__test__',
     '!./components/__mocks__/**/*.js'
   ])
     .pipe(babel())
diff --git a/jest.config.js b/jest.setup.js
similarity index 100%
rename from jest.config.js
rename to jest.setup.js
diff --git a/package.json b/package.json
index 6444aced..47e0d847 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "react-transform-hmr": "^1.0.4",
     "redbox-react": "^1.3.6",
     "rimraf": "^2.6.1",
-    "style-loader": "^0.18.0",
+    "style-loader": "^0.18.1",
     "stylelint": "^7.10.1",
     "stylelint-config-standard": "^16.0.0",
     "stylelint-order": "^0.4.4",
@@ -125,10 +125,10 @@
       "(\\.css$)|(normalize.css/normalize)|(^exports-loader)": "identity-obj-proxy"
     },
     "modulePaths": [
-      "<rootDir>"
+      "<rootDir>/components"
     ],
     "setupFiles": [
-      "./jest.config.js"
+      "./jest.setup.js"
     ],
     "snapshotSerializers": [
       "enzyme-to-json/serializer"
diff --git a/yarn.lock b/yarn.lock
index 173b5c92..776e6899 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6656,9 +6656,9 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
-style-loader@^0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.18.0.tgz#5b7a895860bda966286c8bb80ffd4ccbaf0411f5"
+style-loader@^0.18.1:
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.18.1.tgz#6afca8953c842830e5e2dc84796309880a97f7e8"
   dependencies:
     loader-utils "^1.0.2"
     schema-utils "^0.3.0"