diff --git a/engine/src/test/jme3test/app/state/TestAppStates.java b/engine/src/test/jme3test/app/state/TestAppStates.java
index 53124c00b..c6e893afd 100644
--- a/engine/src/test/jme3test/app/state/TestAppStates.java
+++ b/engine/src/test/jme3test/app/state/TestAppStates.java
@@ -73,7 +73,7 @@ public class TestAppStates extends Application {
                                                            inputManager,
                                                            audioRenderer,
                                                            guiViewPort);
-        niftyDisplay.getNifty().fromXml("jme3test/niftygui/hellojme.xml", "start");
+        niftyDisplay.getNifty().fromXml("Interface/Nifty/HelloJme.xml", "start");
         guiViewPort.addProcessor(niftyDisplay);
     }
 
diff --git a/engine/src/test/jme3test/bullet/TestHoveringTank.java b/engine/src/test/jme3test/bullet/TestHoveringTank.java
index 71eaa9bb6..a9a0eaa8e 100644
--- a/engine/src/test/jme3test/bullet/TestHoveringTank.java
+++ b/engine/src/test/jme3test/bullet/TestHoveringTank.java
@@ -294,8 +294,6 @@ public class TestHoveringTank extends SimpleApplication implements AnalogListene
         terrain.addControl(control);
         terrain.setMaterial(matRock);
         terrain.setLocalScale(new Vector3f(2, 2, 2));
-        terrain.setModelBound(new BoundingBox());
-        terrain.updateModelBound();
         terrain.setLocked(false); // unlock it so we can edit the height
 
         terrain.setShadowMode(ShadowMode.CastAndReceive);
diff --git a/engine/src/test/jme3test/bullet/TestWalkingChar.java b/engine/src/test/jme3test/bullet/TestWalkingChar.java
index 0055b7f00..11dd10c78 100644
--- a/engine/src/test/jme3test/bullet/TestWalkingChar.java
+++ b/engine/src/test/jme3test/bullet/TestWalkingChar.java
@@ -287,8 +287,6 @@ public class TestWalkingChar extends SimpleApplication implements ActionListener
         TerrainLodControl control = new TerrainLodControl(terrain, cameras);
         terrain.addControl(control);
         terrain.setMaterial(matRock);
-        terrain.setModelBound(new BoundingBox());
-        terrain.updateModelBound();
         terrain.setLocalScale(new Vector3f(2, 2, 2));
 
         terrainPhysicsNode = new RigidBodyControl(CollisionShapeFactory.createMeshShape(terrain), 0);
diff --git a/engine/src/test/jme3test/model/shape/TestBox.java b/engine/src/test/jme3test/model/shape/TestBox.java
index cfbeb6785..606805e99 100644
--- a/engine/src/test/jme3test/model/shape/TestBox.java
+++ b/engine/src/test/jme3test/model/shape/TestBox.java
@@ -49,7 +49,7 @@ public class TestBox extends SimpleApplication {
     public void simpleInitApp() {
         Box b = new Box(Vector3f.ZERO, 1, 1, 1);
         Geometry geom = new Geometry("Box", b);
-        Material mat = new Material(assetManager, "Common/MatDefs/Misc/SimpleTextured.j3md");
+        Material mat = new Material(assetManager, "Common/MatDefs/Misc/Unshaded.j3md");
         mat.setTexture("ColorMap", assetManager.loadTexture("Interface/Logo/Monkey.jpg"));
         geom.setMaterial(mat);
         rootNode.attachChild(geom);
diff --git a/engine/src/test/jme3test/post/TestDepthOfField.java b/engine/src/test/jme3test/post/TestDepthOfField.java
index 2cf435624..3fbe2f16a 100644
--- a/engine/src/test/jme3test/post/TestDepthOfField.java
+++ b/engine/src/test/jme3test/post/TestDepthOfField.java
@@ -184,8 +184,6 @@ public class TestDepthOfField extends SimpleApplication {
         terrain.setMaterial(matRock);
         terrain.setLocalScale(new Vector3f(5, 5, 5));
         terrain.setLocalTranslation(new Vector3f(0, -30, 0));
-        terrain.setModelBound(new BoundingBox());
-        terrain.updateModelBound();
         terrain.setLocked(false); // unlock it so we can edit the height
 
         terrain.setShadowMode(ShadowMode.Receive);
diff --git a/engine/src/test/jme3test/terrain/TerrainTest.java b/engine/src/test/jme3test/terrain/TerrainTest.java
index 889d100e9..902b4d04c 100644
--- a/engine/src/test/jme3test/terrain/TerrainTest.java
+++ b/engine/src/test/jme3test/terrain/TerrainTest.java
@@ -166,8 +166,6 @@ public class TerrainTest extends SimpleApplication {
         TerrainLodControl control = new TerrainLodControl(terrain, cameras);
         terrain.addControl(control);
         terrain.setMaterial(matRock);
-        terrain.setModelBound(new BoundingBox());
-        terrain.updateModelBound();
         terrain.setLocalTranslation(0, -100, 0);
         terrain.setLocalScale(2f, 1f, 2f);
         rootNode.attachChild(terrain);
diff --git a/engine/src/test/jme3test/terrain/TerrainTestCollision.java b/engine/src/test/jme3test/terrain/TerrainTestCollision.java
index f6a89531b..51c8bec27 100644
--- a/engine/src/test/jme3test/terrain/TerrainTestCollision.java
+++ b/engine/src/test/jme3test/terrain/TerrainTestCollision.java
@@ -143,8 +143,6 @@ public class TerrainTestCollision extends SimpleApplication {
         terrain.addControl(control);
         terrain.setMaterial(matRock);
         terrain.setLocalScale(new Vector3f(2, 2, 2));
-        terrain.setModelBound(new BoundingBox());
-        terrain.updateModelBound();
         terrain.setLocked(false); // unlock it so we can edit the height
         rootNode.attachChild(terrain);
 
diff --git a/engine/src/test/jme3test/terrain/TerrainTestReadWrite.java b/engine/src/test/jme3test/terrain/TerrainTestReadWrite.java
index 8bcbef586..6bd5ff852 100644
--- a/engine/src/test/jme3test/terrain/TerrainTestReadWrite.java
+++ b/engine/src/test/jme3test/terrain/TerrainTestReadWrite.java
@@ -166,8 +166,6 @@ public class TerrainTestReadWrite extends SimpleApplication {
             TerrainLodControl control = new TerrainLodControl(terrain, cameras);
             terrain.addControl(control);
             terrain.setMaterial(matTerrain);
-            terrain.setModelBound(new BoundingBox());
-            terrain.updateModelBound();
             terrain.setLocalTranslation(0, -100, 0);
             terrain.setLocalScale(2f, 1f, 2f);
             rootNode.attachChild(terrain);
diff --git a/engine/src/test/jme3test/water/TestPostWater.java b/engine/src/test/jme3test/water/TestPostWater.java
index 405a59822..ab81619b9 100644
--- a/engine/src/test/jme3test/water/TestPostWater.java
+++ b/engine/src/test/jme3test/water/TestPostWater.java
@@ -273,8 +273,6 @@ public class TestPostWater extends SimpleApplication {
         terrain.setMaterial(matRock);
         terrain.setLocalScale(new Vector3f(5, 5, 5));
         terrain.setLocalTranslation(new Vector3f(0, -30, 0));
-        terrain.setModelBound(new BoundingBox());
-        terrain.updateModelBound();
         terrain.setLocked(false); // unlock it so we can edit the height
 
         terrain.setShadowMode(ShadowMode.Receive);