diff --git a/assets/prefabs/characters/amphibious.prefab b/assets/prefabs/characters/amphibious.prefab
deleted file mode 100644
index 474c8d0a..00000000
--- a/assets/prefabs/characters/amphibious.prefab
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "Behaviors:testcharacter",
-  "MinionMove": {
-    "movementTypes": ["walking", "leaping", "swimming"]
-  }
-}
\ No newline at end of file
diff --git a/assets/prefabs/characters/flying.prefab b/assets/prefabs/characters/flying.prefab
deleted file mode 100644
index 4e046544..00000000
--- a/assets/prefabs/characters/flying.prefab
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "Behaviors:testcharacter",
-  "MinionMove": {
-    "movementTypes": ["flying"]
-  }
-}
\ No newline at end of file
diff --git a/assets/prefabs/characters/swimming.prefab b/assets/prefabs/characters/swimming.prefab
deleted file mode 100644
index 9bb18d42..00000000
--- a/assets/prefabs/characters/swimming.prefab
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "parent": "Behaviors:testcharacter",
-  "MinionMove": {
-    "movementTypes": [
-      "swimming"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/assets/prefabs/characters/testcharacter.prefab b/assets/prefabs/test/testcharacter.prefab
similarity index 52%
rename from assets/prefabs/characters/testcharacter.prefab
rename to assets/prefabs/test/testcharacter.prefab
index f5733c11..3118262a 100644
--- a/assets/prefabs/characters/testcharacter.prefab
+++ b/assets/prefabs/test/testcharacter.prefab
@@ -1,30 +1,13 @@
 {
-  "MinionMove": {
-    "movementTypes": ["walking", "leaping"]
-  },
-  "NameTag": { "text": "testcharacter" },
   "Behavior" : {
     "tree" : "naiveMoveTo"
   },
   "persisted" : true,
   "location" : {},
-  "Character": {},
-  "CharacterHeldItem" : { },
   "Network" :{},
-  "Health" : {
-    "maxHealth": 1,
-    "currentHealth": 1,
-    "excessSpeedDamageMultiplier": 0,
-    "destroyEntityOnNoHealth" : true
-  },
   "Trigger" : {
     "detectGroups" : ["engine:debris", "engine:sensor"]
   },
-  "CreatureNameGenerator" : {
-    "genderRatio" : 0.5,
-    "nobility" : 0.5,
-    "theme": "DWARF"
-  },
   "AliveCharacter": {},
   "CharacterMovement" : {
     "groundFriction" : 16,
diff --git a/src/test/java/org/terasology/module/behaviors/MovementTests.java b/src/test/java/org/terasology/module/behaviors/MovementTests.java
index 71ef20d5..01a79d1d 100644
--- a/src/test/java/org/terasology/module/behaviors/MovementTests.java
+++ b/src/test/java/org/terasology/module/behaviors/MovementTests.java
@@ -328,11 +328,10 @@ private EntityRef createMovingCharacter(float height, float radius, Vector3i sta
         EntityRef entity = entityManager.create("Behaviors:testcharacter");
         entity.send(new CharacterTeleportEvent(new Vector3f(start)));
 
-        MinionMoveComponent minionMoveComponent = entity.getComponent(MinionMoveComponent.class);
+        MinionMoveComponent minionMoveComponent = new MinionMoveComponent();
         minionMoveComponent.setPathGoal(stop);
-        minionMoveComponent.movementTypes.clear();
         minionMoveComponent.movementTypes.addAll(Sets.newHashSet(movementTypes));
-        entity.saveComponent(minionMoveComponent);
+        entity.addOrSaveComponent(minionMoveComponent);
 
         CharacterMovementComponent charMovementComponent = entity.getComponent(CharacterMovementComponent.class);
         charMovementComponent.height = height;