diff --git a/__tests__/test-import.js b/__tests__/test-import.js
index c83ffecf..c43a5207 100644
--- a/__tests__/test-import.js
+++ b/__tests__/test-import.js
@@ -10,7 +10,7 @@ import { getLanguage } from '../src/app/i18n/Language';
 
 describe('Import Modal', function() {
 
-  let MockRouter = require('../src/app/Router');
+  let MockRouter = require('../src/app/Router').default;
   const Persist = require('../src/app/stores/Persist').default;
   const ModalImport = require('../src/app/components/ModalImport').default;
   const mockContext = {
@@ -25,8 +25,6 @@ describe('Import Modal', function() {
     onWindowResize: jest.genMockFunction()
   };
 
-  MockRouter.go = jest.genMockFunction();
-
   let modal, render, ContextProvider = Utils.createContextProvider(mockContext);
 
   /**
@@ -140,6 +138,7 @@ describe('Import Modal', function() {
 
       expect(modal.state.importValid).toBeTruthy();
       expect(modal.state.errorMsg).toEqual(null);
+      expect(modal.state.singleBuild).toBe(true);
       clickProceed();
       expect(MockRouter.go.mock.calls.length).toBe(1);
       expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/anaconda/48A6A6A5A8A8A5C2c0o0o0o1m1m0q0q0404-0l0b0100034k5n052d04--0303326b.AwRj4zNKqA==.CwBhCYzBGW9qCTSqs5xA?bn=Test%20My%20Ship');
diff --git a/__tests__/test-ship.js b/__tests__/test-ship.js
index 5b9c6a47..e32def5c 100644
--- a/__tests__/test-ship.js
+++ b/__tests__/test-ship.js
@@ -2,7 +2,7 @@ import Ship from '../src/app/shipyard/Ship';
 import { Ships } from 'coriolis-data/dist';
 import * as ModuleUtils from '../src/app/shipyard/ModuleUtils';
 
-describe("Ship Factory", function() {
+describe("Ship", function() {
 
   it("can build all ships", function() {
     for (let s in Ships) {
@@ -115,8 +115,7 @@ describe("Ship Factory", function() {
 
     anaconda.use(anaconda.internal[1], ModuleUtils.internal('4j'));  // 6E Shield Generator
 
-    expect(anaconda.internal[2].c).toEqual(null, 'Anaconda default shield generator slot is empty');
-    expect(anaconda.internal[2].m).toEqual(null, 'Anaconda default shield generator slot id is null');
+    expect(anaconda.internal[2].m).toEqual(null, 'Anaconda default shield generator slot is empty');
     expect(anaconda.internal[1].m.id).toEqual('4j', 'Slot 1 should have SG 4j in it');
     expect(anaconda.internal[1].m.grp).toEqual('sg','Slot 1 should have SG 4j in it');
 
@@ -133,8 +132,7 @@ describe("Ship Factory", function() {
 
     anaconda.use(anaconda.internal[3], ModuleUtils.internal('32'));
 
-    expect(anaconda.internal[4].c).toEqual(null, 'Anaconda original fuel scoop slot is empty');
-    expect(anaconda.internal[4].m).toEqual(null, 'Anaconda original fuel scoop slot id is null');
+    expect(anaconda.internal[4].m).toEqual(null, 'Anaconda original fuel scoop slot is empty');
     expect(anaconda.internal[3].m.id).toEqual('32', 'Slot 1 should have FS 32 in it');
     expect(anaconda.internal[3].m.grp).toEqual('fs','Slot 1 should have FS 32 in it');
   });
@@ -150,8 +148,7 @@ describe("Ship Factory", function() {
 
     anaconda.use(anaconda.internal[3], ModuleUtils.internal('23'));
 
-    expect(anaconda.internal[4].c).toEqual(null, 'Anaconda original refinery slot is empty');
-    expect(anaconda.internal[4].m).toEqual(null, 'Anaconda original refinery slot id is null');
+    expect(anaconda.internal[4].m).toEqual(null, 'Anaconda original refinery slot is empty');
     expect(anaconda.internal[3].m.id).toEqual('23', 'Slot 1 should have RF 23 in it');
     expect(anaconda.internal[3].m.grp).toEqual('rf','Slot 1 should have RF 23 in it');
   });