diff --git a/core/src/net/sf/openrocket/motor/MotorConfiguration.java b/core/src/net/sf/openrocket/motor/MotorConfiguration.java
index 5248caa93..7148cd479 100644
--- a/core/src/net/sf/openrocket/motor/MotorConfiguration.java
+++ b/core/src/net/sf/openrocket/motor/MotorConfiguration.java
@@ -26,7 +26,7 @@ public class MotorConfiguration implements FlightConfigurableParameter<MotorConf
 
 	protected boolean ignitionOveride = false;
 	protected double ignitionDelay = 0.0;
-	protected IgnitionEvent ignitionEvent = IgnitionEvent.NEVER;
+	protected IgnitionEvent ignitionEvent = IgnitionEvent.AUTOMATIC;
 	
 	protected int modID = 0;
 	
@@ -41,13 +41,7 @@ public class MotorConfiguration implements FlightConfigurableParameter<MotorConf
 		this.mount = _mount;
 		this.fcid = _fcid;
 		this.id = new MotorConfigurationId( _mount, _fcid );
-		
-		this.motor = null;
-		ejectionDelay = 0.0;
-		ignitionEvent = IgnitionEvent.NEVER;
-		ignitionDelay = 0.0;
-		
-
+        
 		modID++;
 	}
 	
diff --git a/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java b/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java
index 6c1627ab6..5d372d8b9 100644
--- a/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java
+++ b/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java
@@ -81,7 +81,6 @@ public class BarrowmanCalculatorTest {
 			exp_cpx = ( cna_nose*cpx_nose + cna_body*cpx_body + cna_3fin*cpx_3fin + cna_lugs*cpx_lugs)/exp_cna;
 		}
 		
-		// calculated from OpenRocket 15.03
 		Coordinate cp_calc = calc.getCP(config, conditions, warnings);
 		
 		assertEquals(" Estes Alpha III CNa value is incorrect:", exp_cna, cp_calc.weight, EPSILON);
@@ -117,9 +116,8 @@ public class BarrowmanCalculatorTest {
 		FlightConditions conditions = new FlightConditions(config);
 		WarningSet warnings = new WarningSet();
 		
-		// no clue:
-		double expCPx = 1.0367644;
-		double expCNa = 14.169;
+		double expCPx = 0.994642;
+		double expCNa = 15.437111;
 		Coordinate calcCP = calc.getCP(config, conditions, warnings);
 		
 		assertEquals(" Falcon 9 Heavy CP x value is incorrect:", expCPx, calcCP.x, EPSILON);
diff --git a/swing/OpenRocket Swing.iml b/swing/OpenRocket Swing.iml
index 045ebe7be..27d5f85ad 100644
--- a/swing/OpenRocket Swing.iml	
+++ b/swing/OpenRocket Swing.iml	
@@ -29,6 +29,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="inheritedJdk" />
@@ -206,5 +207,6 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="junit-dep-4.8.2" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/swing/test/net/sf/openrocket/IntegrationTest.java b/swing/test/net/sf/openrocket/IntegrationTest.java
index 9bb4ff0d7..1783228e8 100644
--- a/swing/test/net/sf/openrocket/IntegrationTest.java
+++ b/swing/test/net/sf/openrocket/IntegrationTest.java
@@ -28,17 +28,12 @@ import net.sf.openrocket.file.motor.GeneralMotorLoader;
 import net.sf.openrocket.gui.main.UndoRedoAction;
 import net.sf.openrocket.l10n.DebugTranslator;
 import net.sf.openrocket.l10n.Translator;
-import net.sf.openrocket.masscalc.BasicMassCalculator;
 import net.sf.openrocket.masscalc.MassCalculator;
 import net.sf.openrocket.masscalc.MassCalculator.MassCalcType;
 import net.sf.openrocket.motor.Motor;
 import net.sf.openrocket.motor.ThrustCurveMotor;
 import net.sf.openrocket.plugin.PluginModule;
-import net.sf.openrocket.rocketcomponent.Configuration;
-import net.sf.openrocket.rocketcomponent.EngineBlock;
-import net.sf.openrocket.rocketcomponent.MassComponent;
-import net.sf.openrocket.rocketcomponent.NoseCone;
-import net.sf.openrocket.rocketcomponent.RocketComponent;
+import net.sf.openrocket.rocketcomponent.*;
 import net.sf.openrocket.simulation.FlightDataType;
 import net.sf.openrocket.simulation.exception.SimulationException;
 import net.sf.openrocket.startup.Application;
@@ -71,8 +66,8 @@ public class IntegrationTest {
 	private Action undoAction, redoAction;
 	
 	private AerodynamicCalculator aeroCalc = new BarrowmanCalculator();
-	private MassCalculator massCalc = new BasicMassCalculator();
-	private Configuration config;
+	private MassCalculator massCalc = new MassCalculator();
+	private FlightConfiguration config;
 	private FlightConditions conditions;
 	private String massComponentID = null;
 	
@@ -113,7 +108,8 @@ public class IntegrationTest {
 		
 		undoAction = UndoRedoAction.newUndoAction(document);
 		redoAction = UndoRedoAction.newRedoAction(document);
-		config = document.getSimulation(0).getConfiguration();
+        FlightConfigurationId fcid = document.getSimulation(0).getFlightConfigurationId();
+		config = document.getRocket().getFlightConfiguration(fcid);
 		conditions = new FlightConditions(config);
 		
 		// Test undo state