diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssignmentsToOrderElementTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssignmentsToOrderElementTest.java
index c7f94fd5f..5939860e0 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssignmentsToOrderElementTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssignmentsToOrderElementTest.java
@@ -353,23 +353,26 @@ public class AddAdvanceAssignmentsToOrderElementTest {
     @Test(expected = DuplicateAdvanceAssignmentForOrderElementException.class)
     public void addingAnotherAdvanceAssignmentWithAnEquivalentTypeButDifferentInstance()
             throws Exception {
+
         final Order order = createValidOrder();
-        OrderLine line = createValidLeaf("GranSon", "75757");
+        final OrderLine line = createValidLeaf("GranSon", "75757");
         order.add(line);
         orderDao.save(order);
 
         AdvanceType type = createAndSaveType("tipoA");
         getSession().flush();
-        getSession().evict(type);
 
-        AdvanceType typeReloaded = reloadType(type);
-
-        DirectAdvanceAssignment assignment = createValidAdvanceAssignment(false);
+        final DirectAdvanceAssignment assignment = createValidAdvanceAssignment(false);
         assignment.setAdvanceType(type);
-        DirectAdvanceAssignment assignmentWithSameType = createValidAdvanceAssignment(false);
-        assignmentWithSameType.setAdvanceType(typeReloaded);
 
         line.addAdvanceAssignment(assignment);
+
+        getSession().evict(type);
+        AdvanceType typeReloaded = reloadType(type);
+
+        final DirectAdvanceAssignment assignmentWithSameType = createValidAdvanceAssignment(false);
+        assignmentWithSameType.setAdvanceType(typeReloaded);
+
         line.addAdvanceAssignment(assignmentWithSameType);
     }
 
@@ -393,10 +396,14 @@ public class AddAdvanceAssignmentsToOrderElementTest {
 
         AdvanceType advanceType = createAndSaveType("test");
 
-        DirectAdvanceAssignment advanceAssignment = createValidAdvanceAssignment(true);
-        advanceAssignment.setAdvanceType(advanceType);
+        DirectAdvanceAssignment advanceAssignmentA = createValidAdvanceAssignment(true);
+        advanceAssignmentA.setAdvanceType(advanceType);
 
-        orderLineGroup.addAdvanceAssignment(advanceAssignment);
+        DirectAdvanceAssignment advanceAssignmentB = createValidAdvanceAssignment(true);
+        advanceAssignmentB.setAdvanceType(advanceType);
+
+        orderLineGroup.addAdvanceAssignment(advanceAssignmentA);
+        orderLineGroup.addAdvanceAssignment(advanceAssignmentB);
     }
 
 }
diff --git a/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderModelTest.java b/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderModelTest.java
index de4e65c0d..434de46b8 100644
--- a/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderModelTest.java
+++ b/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderModelTest.java
@@ -272,7 +272,7 @@ public class OrderModelTest {
                     for (OrderElement orderElement : elements) {
                         assertThat(((OrderLineGroup) orderElement)
                                 .getIndirectAdvanceAssignments().size(),
-                                equalTo(1));
+                                equalTo(0));
                     }
                     for (int i = 0; i < containers.length; i++) {
                         assertThat(elements.get(i).getId(),