diff --git a/internal_packages/preferences/lib/tabs/preferences-account-list.jsx b/internal_packages/preferences/lib/tabs/preferences-account-list.jsx
index 84a4faec8..c665d8d3f 100644
--- a/internal_packages/preferences/lib/tabs/preferences-account-list.jsx
+++ b/internal_packages/preferences/lib/tabs/preferences-account-list.jsx
@@ -1,6 +1,5 @@
 import React, {Component, PropTypes} from 'react';
 import {RetinaImg, Flexbox, EditableList} from 'nylas-component-kit';
-import {Account} from 'nylas-exports';
 import classnames from 'classnames';
 
 class PreferencesAccountList extends Component {
diff --git a/internal_packages/preferences/spec/preferences-account-details-spec.jsx b/internal_packages/preferences/spec/preferences-account-details-spec.jsx
index b1c693e33..f31f01944 100644
--- a/internal_packages/preferences/spec/preferences-account-details-spec.jsx
+++ b/internal_packages/preferences/spec/preferences-account-details-spec.jsx
@@ -1,5 +1,6 @@
 import React, {addons} from 'react/addons';
 import PreferencesAccountDetails from '../lib/tabs/preferences-account-details';
+import {Account} from 'nylas-exports';
 const {TestUtils: {renderIntoDocument}} = addons;
 
 
@@ -7,13 +8,14 @@ const makeComponent = (props = {})=> {
   return renderIntoDocument(<PreferencesAccountDetails {...props} />);
 };
 
-const account = {
+const account = new Account({
   id: 1,
+  clientId: 1,
   name: 'someone',
   emailAddress: 'someone@nylas.com',
   aliases: [],
   defaultAlias: null,
-}
+})
 
 describe('PreferencesAccountDetails', ()=> {
   beforeEach(()=> {
@@ -24,15 +26,9 @@ describe('PreferencesAccountDetails', ()=> {
   })
 
   function assertAccountState(actual, expected) {
-    expect(actual).toEqual({
-      account: {
-        id: expected.id || 1,
-        name: expected.name || 'someone',
-        emailAddress: expected.emailAddress || 'someone@nylas.com',
-        aliases: expected.aliases || [],
-        defaultAlias: expected.defaultAlias || null,
-      },
-    })
+    for (const key of Object.keys(expected)) {
+      expect(actual.account[key]).toEqual(expected[key]);
+    }
   }
 
   describe('_makeAlias', ()=> {