diff --git a/core/src/net/sf/openrocket/util/TestRockets.java b/core/src/net/sf/openrocket/util/TestRockets.java
index 8636480be..129344544 100644
--- a/core/src/net/sf/openrocket/util/TestRockets.java
+++ b/core/src/net/sf/openrocket/util/TestRockets.java
@@ -556,12 +556,13 @@ public class TestRockets {
 	// 
 	// This function is used for unit, integration tests, DO NOT CHANGE WITHOUT UPDATING TESTS
 	public static final Rocket makeBeta(){
-		Rocket rocket = makeEstesAlphaIII();
+		final Rocket rocket = makeEstesAlphaIII();
 		rocket.setName("Kit-bash Beta");
 		
-		AxialStage sustainerStage = (AxialStage)rocket.getChild(0);
+		final AxialStage sustainerStage = (AxialStage)rocket.getChild(0);
 		sustainerStage.setName( "Sustainer Stage");
-		BodyTube sustainerBody = (BodyTube)sustainerStage.getChild(1);
+		final BodyTube sustainerBody = (BodyTube)sustainerStage.getChild(1);
+		sustainerBody.setName("Sustainer Body Tube");
 		final double sustainerRadius = sustainerBody.getAftRadius();
 		final double sustainerThickness = sustainerBody.getThickness();
 		
@@ -586,7 +587,7 @@ public class TestRockets {
 				double finRootChord = .05;
 				double finTipChord = .03;
 				double finSweep = 0.02;
-				double finHeight = 0.03;
+				double finHeight = 0.05;
 				FinSet finset = new TrapezoidFinSet(finCount, finRootChord, finTipChord, finSweep, finHeight);
 				finset.setName("Booster Fins");
 				finset.setThickness( 0.0032);
@@ -610,6 +611,15 @@ public class TestRockets {
 					boosterMMT.setMotorConfig( motorConfig, TEST_FCID_1);
 				}
 				boosterBody.addChild(boosterMMT);
+				
+				LaunchLug lug = new LaunchLug();
+				lug.setName("Launch Lugs");
+				lug.setAxialMethod(AxialMethod.TOP);
+				lug.setAxialOffset(0.0);
+				lug.setLength(0.050);
+				lug.setOuterRadius(0.0022);
+				lug.setInnerRadius(0.0020);
+				boosterBody.addChild(lug);
 			}
 
 			// Tail Cone
diff --git a/core/test/net/sf/openrocket/rocketcomponent/BoundingBoxTest.java b/core/test/net/sf/openrocket/rocketcomponent/BoundingBoxTest.java
new file mode 100644
index 000000000..251fcfc60
--- /dev/null
+++ b/core/test/net/sf/openrocket/rocketcomponent/BoundingBoxTest.java
@@ -0,0 +1,111 @@
+package net.sf.openrocket.rocketcomponent;
+
+import net.sf.openrocket.rocketcomponent.position.AngleMethod;
+import net.sf.openrocket.rocketcomponent.position.AxialMethod;
+import net.sf.openrocket.rocketcomponent.position.RadiusMethod;
+import net.sf.openrocket.util.ArrayList;
+import net.sf.openrocket.util.BaseTestCase.BaseTestCase;
+import net.sf.openrocket.util.BoundingBox;
+import net.sf.openrocket.util.Coordinate;
+import net.sf.openrocket.util.MathUtil;
+import net.sf.openrocket.util.TestRockets;
+import org.junit.Test;
+
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+public class BoundingBoxTest extends BaseTestCase {
+	final double EPSILON = MathUtil.EPSILON;
+
+	@Test
+	public void testEstesAlphaIIIBoundingBox(){
+		final Rocket rocket = TestRockets.makeEstesAlphaIII();
+		
+		final FlightConfiguration config = rocket.getSelectedConfiguration();
+		final BoundingBox bounds = config.getBoundingBox();
+		
+		assertEquals("bounds max x",  0.000000000, bounds.min.x, EPSILON);
+		assertEquals("bounds max x",  0.270000000, bounds.max.x, EPSILON);
+		assertEquals("bounds min y", -0.032385640, bounds.min.y, EPSILON);
+		assertEquals("bounds max y",  0.062000000, bounds.max.y, EPSILON);
+		assertEquals("bounds min z", -0.054493575, bounds.min.z, EPSILON);
+		assertEquals("bounds max z",  0.052893575, bounds.max.z, EPSILON);
+	}
+
+
+	@Test
+	public void testBetaBoundingBox() {
+		Rocket rocket = TestRockets.makeBeta();
+		
+		final FlightConfiguration config = rocket.getSelectedConfiguration();
+		
+		{ // case A: All Stages
+			config.setAllStages();
+
+			// DEBUG
+			System.err.println("==== Case A: All Stages ====");
+			
+			final BoundingBox bounds = config.getBoundingBox();
+			
+			assertEquals("bounds min x",  0.000000000, bounds.min.x, EPSILON);
+			assertEquals("bounds max x",  0.335000000, bounds.max.x, EPSILON);
+			assertEquals("bounds min y", -0.032385640, bounds.min.y, EPSILON);
+			assertEquals("bounds max y",  0.062000000, bounds.max.y, EPSILON);
+			assertEquals("bounds min z", -0.054493575, bounds.min.z, EPSILON);
+			assertEquals("bounds max z",  0.052893575, bounds.max.z, EPSILON);
+		}
+		{ // case B: Sustainer Only
+			config.setOnlyStage(0);
+			
+			// DEBUG
+			System.err.println("==== Case B: Sustainer Only ====");
+			
+			final BoundingBox bounds = config.getBoundingBox();
+			
+			assertEquals("bounds min x",  0.000000000, bounds.min.x, EPSILON);
+			assertEquals("bounds max x",  0.270000000, bounds.max.x, EPSILON);
+			assertEquals("bounds min y", -0.032385640, bounds.min.y, EPSILON);
+			assertEquals("bounds max y",  0.062000000, bounds.max.y, EPSILON);
+			assertEquals("bounds min z", -0.054493575, bounds.min.z, EPSILON);
+			assertEquals("bounds max z",  0.052893575, bounds.max.z, EPSILON);
+		}
+		{ // case C: Booster Only
+			config.setOnlyStage(1);
+			
+			// DEBUG
+			System.err.println("==== Case C: Booster Only ====");
+			System.err.println(rocket.toDebugTree());
+			
+			final BoundingBox bounds = config.getBoundingBox();
+			
+			assertEquals("bounds min x",  0.270000000, bounds.min.x, EPSILON);
+			assertEquals("bounds max x",  0.335000000, bounds.max.x, EPSILON);
+			assertEquals("bounds min y", -0.032385640, bounds.min.y, EPSILON);
+			assertEquals("bounds max y",  0.062000000, bounds.max.y, EPSILON);
+			assertEquals("bounds min z", -0.054493575, bounds.min.z, EPSILON);
+			assertEquals("bounds max z",  0.052893575, bounds.max.z, EPSILON);
+		}
+	}
+	
+	@Test
+	public void testFalcon9HBoundingBox() {
+		Rocket rocket = TestRockets.makeFalcon9Heavy();
+
+		// DEBUG
+		System.err.println(rocket.toDebugTree());
+
+		final BoundingBox bounds = rocket.getBoundingBox();
+		assertEquals( 0.0,   bounds.min.x,  EPSILON);
+		assertEquals( 1.364, bounds.max.x, EPSILON);
+
+		assertEquals( -0.215500, bounds.min.y, EPSILON);
+		assertEquals(  0.215500, bounds.max.y, EPSILON);
+
+		assertEquals( -0.12069451, bounds.min.z, EPSILON);
+		assertEquals(  0.12069451, bounds.max.z, EPSILON);
+	}
+
+}