diff --git a/addon/templates/components/ember-form-master-2000/fm-select.hbs b/addon/templates/components/ember-form-master-2000/fm-select.hbs
index 51b5c98..5787c53 100644
--- a/addon/templates/components/ember-form-master-2000/fm-select.hbs
+++ b/addon/templates/components/ember-form-master-2000/fm-select.hbs
@@ -4,11 +4,9 @@
   </option>
 {{/if}}
 
-{{optionValuePath}} / {{optionLabelPath}}
-
 {{#each content key="@identity" as |item|}}
-  <option value="{{get item optionValuePath}}"
-          selected={{is-equal (get item optionValuePath) value}}>
+  <option value="{{if optionValuePath (get item optionValuePath) item}}"
+          selected={{is-equal (if optionValuePath (get item optionValuePath) item) value}}>
     {{get item optionLabelPath}}
   </option>
 {{/each}}
diff --git a/bower.json b/bower.json
index 6cc300e..08e6071 100644
--- a/bower.json
+++ b/bower.json
@@ -2,14 +2,14 @@
   "name": "ember-form-master-2000",
   "dependencies": {
     "ember": "^2.1.0",
-    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
+    "ember-cli-shims": "0.1.0",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
     "ember-data": "^2.1.0",
     "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
-    "ember-qunit": "0.4.9",
+    "ember-qunit": "0.4.18",
     "ember-qunit-notifications": "0.0.7",
     "ember-resolver": "~0.1.18",
-    "jquery": "^1.11.3",
+    "jquery": "1.11.3",
     "loader.js": "ember-cli/loader.js#3.2.1",
     "qunit": "~1.18.0"
   },
diff --git a/tests/integration/components/fm-checkbox-test.js b/tests/integration/components/fm-checkbox-test.js
index e363438..5e5d3a0 100644
--- a/tests/integration/components/fm-checkbox-test.js
+++ b/tests/integration/components/fm-checkbox-test.js
@@ -25,7 +25,7 @@ moduleForComponent('fm-checkbox', 'Integration | Component | fm-checkbox', {
 //   assert.equal(this.$('label').text().trim(), 'This is the label', 'the fm-checkbox label matches');
 // });
 
-test('errors are shown after user interaction but not before', function(assert) {
+test('errors are shown after user interaction but not before if fmConfig.showErrorsByDefault is false', function(assert) {
   this.set('errors', ['error message']);
   this.render(hbs `{{fm-checkbox errors=errors}}`);
   assert.ok(
diff --git a/tests/integration/components/fm-field-test.js b/tests/integration/components/fm-field-test.js
index d380643..d70a402 100644
--- a/tests/integration/components/fm-field-test.js
+++ b/tests/integration/components/fm-field-test.js
@@ -1,13 +1,16 @@
 import { moduleForComponent, test } from 'ember-qunit';
 import Ember from 'ember';
 import hbs from 'htmlbars-inline-precompile';
+import fmConfig from 'ember-form-master-2000/services/fm-config';
 // import {initialize} from 'ember-form-master-2000/initializers/fm-initialize';
 
 moduleForComponent('fm-field', 'Integration | Component | fm-field', {
   integration: true,
   setup: function() {
-    this.container.inject = this.container.injection;
+    // this.container.inject = this.container.injection;
     // initialize(null, this.container);
+    this.register('service:fm-config', fmConfig);
+    this.inject.service('fm-config', { as: 'config'});
   }
 });
 
@@ -97,7 +100,8 @@ test('selection option label is updated when property changes', function(assert)
   assert.equal(this.$('option').text().trim(), 'bar');
 });
 
-test('errors are not shown after user interaction but not before', function(assert) {
+test('errors are shown after user interaction but not before', function(assert) {
+  this.set('config.showErrorsByDefault', false);
   this.set('errors', ['error message']);
   this.render(hbs `{{fm-field errors=errors}}`);
   assert.ok(
@@ -124,7 +128,8 @@ test('errors are not shown after user interaction but not before', function(asse
   );
 });
 
-test('errors are not shown after user interaction but not before (textarea)', function(assert) {
+test('errors are shown after user interaction but not before (textarea)', function(assert) {
+  this.set('config.showErrorsByDefault', false);
   this.set('errors', ['error message']);
   this.render(hbs `{{fm-field type='textarea' errors=errors}}`);
   assert.ok(
@@ -151,7 +156,8 @@ test('errors are not shown after user interaction but not before (textarea)', fu
   );
 });
 
-test('errors are not shown after user interaction but not before (select)', function(assert) {
+test('errors are shown after user interaction but not before (select)', function(assert) {
+  this.set('config.showErrorsByDefault', false);
   this.set('errors', ['error message']);
   this.render(hbs `{{fm-field type='select' errors=errors}}`);
   assert.ok(
diff --git a/tests/integration/components/fm-form-test.js b/tests/integration/components/fm-form-test.js
index feb8ad7..40eacd3 100644
--- a/tests/integration/components/fm-form-test.js
+++ b/tests/integration/components/fm-form-test.js
@@ -1,13 +1,16 @@
 import { moduleForComponent, test } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
+import fmConfig from 'ember-form-master-2000/services/fm-config';
 // import {initialize} from 'ember-form-master-2000/initializers/fm-initialize';
 //
 moduleForComponent('fm-form', 'Integration | Component | fm-form', {
   integration: true,
-//   setup: function() {
+   setup: function() {
+     this.register('service:fm-config', fmConfig);
+     this.inject.service('fm-config', { as: 'config' });
 //     this.container.inject = this.container.injection;
 //     initialize(null, this.container);
-//   }
+   }
 });
 //
 // test('renders properly', function(assert) {
@@ -24,6 +27,7 @@ moduleForComponent('fm-form', 'Integration | Component | fm-form', {
 // });
 
 test('form shows errors on submit', function(assert) {
+  this.set('config.showErrorsByDefault', false);
   this.set('errors', ['error message']);
   this.render(hbs `
     {{#fm-form}}
diff --git a/tests/integration/components/fm-select-test.js b/tests/integration/components/fm-select-test.js
index 085ea5c..f0667e1 100644
--- a/tests/integration/components/fm-select-test.js
+++ b/tests/integration/components/fm-select-test.js
@@ -44,6 +44,19 @@
    assert.equal(this.$('option:last').attr('value'), 'goodbye');
  });
 
+ test('entire object is set as value when optionValuePath is empty string', function(assert) {
+   const obj1 = Ember.Object.create({text: 'hi', itemValue: 'hello'});
+   const obj2 = Ember.Object.create({text: 'bye', itemValue: 'goodbye'});
+   this.set('content', Ember.A([obj1, obj2]));
+   this.set('optionLabelPath', 'text');
+   this.set('optionValuePath', '');
+   this.render(hbs `{{fm-select content=content optionLabelPath=optionLabelPath optionValuePath=optionValuePath}}`);
+   assert.equal(this.$('option:first').text().trim(), 'hi');
+   assert.equal(this.$('option:last').text().trim(), 'bye');
+   assert.equal(this.$('option:first').attr('value'), obj1.toString());
+   assert.equal(this.$('option:last').attr('value'), obj2.toString());
+ });
+
  test('fm-select calls `action` with newly chosen value', function(assert) {
    this.set('content', Ember.A([
      {label: 'one', value: 1},