diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index a28f5c03..e415edb4 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -121,8 +121,9 @@ class TestRma(common.SavepointCase):
                     _prepare_rma_line_from_stock_move(move)
                 wizard.add_lines()
 
-                for operation in move.product_id.rma_customer_operation_id:
-                    operation.in_route_id = False
+                if move.product_id.rma_customer_operation_id:
+                    move.product_id.rma_customer_operation_id.in_route_id = \
+                        False
                 move.product_id.categ_id.rma_customer_operation_id = False
                 move.product_id.rma_customer_operation_id = False
                 wizard._prepare_rma_line_from_stock_move(move)
@@ -147,8 +148,9 @@ class TestRma(common.SavepointCase):
                     _prepare_rma_line_from_stock_move(move)
                 wizard.add_lines()
 
-                for operation in move.product_id.rma_customer_operation_id:
-                    operation.in_route_id = False
+                if move.product_id.rma_customer_operation_id:
+                    move.product_id.rma_customer_operation_id.in_route_id = \
+                        False
                 move.product_id.categ_id.rma_supplier_operation_id = False
                 move.product_id.rma_supplier_operation_id = False
                 wizard._prepare_rma_line_from_stock_move(move)
@@ -189,8 +191,8 @@ class TestRma(common.SavepointCase):
         }
         return res
 
-    def test_01_rma_order_line(cls):
-        for line in cls.rma_customer_id.rma_line_ids:
+    def test_01_rma_order_line(self):
+        for line in self.rma_customer_id.rma_line_ids:
             line.with_context({'default_rma_id': line.rma_id.id
                                })._default_warehouse_id()
             line._default_location_id()
@@ -200,409 +202,409 @@ class TestRma(common.SavepointCase):
             line._compute_out_shipment_count()
 
             data = {'reference_move_id': line.reference_move_id.id}
-            new_line = cls.rma_line.new(data)
+            new_line = self.rma_line.new(data)
             new_line._onchange_reference_move_id()
 
             # check assert if call reference_move_id onchange
-            cls.assertEquals(new_line.product_id,
-                             line.reference_move_id.product_id)
-            cls.assertEquals(new_line.product_qty,
-                             line.reference_move_id.product_uom_qty)
-            cls.assertEquals(new_line.location_id.location_id,
-                             line.reference_move_id.location_id)
-            cls.assertEquals(new_line.origin,
-                             line.reference_move_id.picking_id.name)
-            cls.assertEquals(new_line.delivery_address_id,
-                             line.reference_move_id.picking_partner_id)
-            cls.assertEquals(new_line.qty_to_receive,
-                             line.reference_move_id.product_uom_qty)
+            self.assertEquals(new_line.product_id,
+                              line.reference_move_id.product_id)
+            self.assertEquals(new_line.product_qty,
+                              line.reference_move_id.product_uom_qty)
+            self.assertEquals(new_line.location_id.location_id,
+                              line.reference_move_id.location_id)
+            self.assertEquals(new_line.origin,
+                              line.reference_move_id.picking_id.name)
+            self.assertEquals(new_line.delivery_address_id,
+                              line.reference_move_id.picking_partner_id)
+            self.assertEquals(new_line.qty_to_receive,
+                              line.reference_move_id.product_uom_qty)
 
             line.action_rma_to_approve()
             line.action_rma_draft()
             line.action_rma_done()
 
             data = {'product_id': line.product_id.id}
-            new_line = cls.rma_line.new(data)
+            new_line = self.rma_line.new(data)
             new_line._onchange_product_id()
 
             data = {'operation_id': line.operation_id.id}
-            new_line = cls.rma_line.new(data)
+            new_line = self.rma_line.new(data)
             new_line._onchange_operation_id()
 
             # check assert if call operation_id onchange
-            cls.assertEquals(new_line.operation_id.receipt_policy,
-                             line.receipt_policy)
+            self.assertEquals(new_line.operation_id.receipt_policy,
+                              line.receipt_policy)
 
             data = {'customer_to_supplier': line.customer_to_supplier}
-            new_line = cls.rma_line.new(data)
+            new_line = self.rma_line.new(data)
             new_line._onchange_receipt_policy()
 
             data = {'lot_id': line.lot_id.id}
-            new_line = cls.rma_line.new(data)
+            new_line = self.rma_line.new(data)
             new_line._onchange_lot_id()
 
             line.action_view_in_shipments()
             line.action_view_out_shipments()
-            cls.rma_customer_id.action_view_supplier_lines()
-            with cls.assertRaises(ValidationError):
-                line.rma_id.partner_id = cls.partner_id.id
-                cls.rma_customer_id.rma_line_ids[0].\
-                    partner_id = cls.env.ref('base.res_partner_3').id
-        cls.rma_customer_id.action_view_supplier_lines()
+            self.rma_customer_id.action_view_supplier_lines()
+            with self.assertRaises(ValidationError):
+                line.rma_id.partner_id = self.partner_id.id
+                self.rma_customer_id.rma_line_ids[0].\
+                    partner_id = self.env.ref('base.res_partner_3').id
+        self.rma_customer_id.action_view_supplier_lines()
 
-    def test_02_customer_rma(cls):
-        wizard = cls.rma_make_picking.with_context({
-            'active_ids': cls.rma_customer_id.rma_line_ids.ids,
+    def test_02_customer_rma(self):
+        wizard = self.rma_make_picking.with_context({
+            'active_ids': self.rma_customer_id.rma_line_ids.ids,
             'active_model': 'rma.order.line',
             'picking_type': 'incoming',
             'active_id': 1
         }).create({})
         wizard._create_picking()
-        res = cls.rma_customer_id.rma_line_ids.action_view_in_shipments()
-        cls.assertTrue('res_id' in res,
-                       "Incorrect number of pickings created")
-        picking = cls.env['stock.picking'].browse(res['res_id'])
-        cls.assertEquals(len(picking), 1,
-                         "Incorrect number of pickings created")
+        res = self.rma_customer_id.rma_line_ids.action_view_in_shipments()
+        self.assertTrue('res_id' in res,
+                        "Incorrect number of pickings created")
+        picking = self.env['stock.picking'].browse(res['res_id'])
+        self.assertEquals(len(picking), 1,
+                          "Incorrect number of pickings created")
         moves = picking.move_lines
-        cls.assertEquals(len(moves), 3,
-                         "Incorrect number of moves created")
-        for line in cls.rma_customer_id.rma_line_ids:
+        self.assertEquals(len(moves), 3,
+                          "Incorrect number of moves created")
+        for line in self.rma_customer_id.rma_line_ids:
             # common qtys for all products
-            cls.assertEquals(line.qty_received, 0,
-                             "Wrong qty received")
-            cls.assertEquals(line.qty_to_deliver, 0,
-                             "Wrong qty to deliver")
-            cls.assertEquals(line.qty_outgoing, 0,
-                             "Wrong qty outgoing")
-            cls.assertEquals(line.qty_delivered, 0,
-                             "Wrong qty delivered")
+            self.assertEquals(line.qty_received, 0,
+                              "Wrong qty received")
+            self.assertEquals(line.qty_to_deliver, 0,
+                              "Wrong qty to deliver")
+            self.assertEquals(line.qty_outgoing, 0,
+                              "Wrong qty outgoing")
+            self.assertEquals(line.qty_delivered, 0,
+                              "Wrong qty delivered")
             # product specific
-            if line.product_id == cls.product_1:
-                cls.assertEquals(line.qty_to_receive, 3,
-                                 "Wrong qty to receive")
-                cls.assertEquals(line.qty_incoming, 3,
-                                 "Wrong qty incoming")
-            if line.product_id == cls.product_2:
-                cls.assertEquals(line.qty_to_receive, 5,
-                                 "Wrong qty to receive")
-                cls.assertEquals(line.qty_incoming, 5,
-                                 "Wrong qty incoming")
-            if line.product_id == cls.product_3:
-                cls.assertEquals(line.qty_to_receive, 2,
-                                 "Wrong qty to receive")
-                cls.assertEquals(line.qty_incoming, 2,
-                                 "Wrong qty incoming")
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_to_receive, 3,
+                                  "Wrong qty to receive")
+                self.assertEquals(line.qty_incoming, 3,
+                                  "Wrong qty incoming")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_to_receive, 5,
+                                  "Wrong qty to receive")
+                self.assertEquals(line.qty_incoming, 5,
+                                  "Wrong qty incoming")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_to_receive, 2,
+                                  "Wrong qty to receive")
+                self.assertEquals(line.qty_incoming, 2,
+                                  "Wrong qty incoming")
         picking.action_assign()
         for mv in picking.move_lines:
             mv.quantity_done = mv.product_uom_qty
         picking.action_done()
-        for line in cls.rma_customer_id.rma_line_ids:
-            cls.assertEquals(line.qty_to_receive, 0,
-                             "Wrong qty to_receive")
-            cls.assertEquals(line.qty_incoming, 0,
-                             "Wrong qty incoming")
-            cls.assertEquals(line.qty_outgoing, 0,
-                             "Wrong qty outgoing")
-            cls.assertEquals(line.qty_delivered, 0,
-                             "Wrong qty delivered")
-            if line.product_id == cls.product_1:
-                cls.assertEquals(line.qty_received, 3,
-                                 "Wrong qty received")
-                cls.assertEquals(line.qty_to_deliver, 3,
-                                 "Wrong qty to_deliver")
-            if line.product_id == cls.product_2:
-                cls.assertEquals(line.qty_received, 5,
-                                 "Wrong qty received")
-                cls.assertEquals(line.qty_to_deliver, 5,
-                                 "Wrong qty to_deliver")
-            if line.product_id == cls.product_3:
-                cls.assertEquals(line.qty_received, 2,
-                                 "Wrong qty received")
-                cls.assertEquals(line.qty_to_deliver, 2,
-                                 "Wrong qty to_deliver")
+        for line in self.rma_customer_id.rma_line_ids:
+            self.assertEquals(line.qty_to_receive, 0,
+                              "Wrong qty to_receive")
+            self.assertEquals(line.qty_incoming, 0,
+                              "Wrong qty incoming")
+            self.assertEquals(line.qty_outgoing, 0,
+                              "Wrong qty outgoing")
+            self.assertEquals(line.qty_delivered, 0,
+                              "Wrong qty delivered")
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_received, 3,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_to_deliver, 3,
+                                  "Wrong qty to_deliver")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_received, 5,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_to_deliver, 5,
+                                  "Wrong qty to_deliver")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_received, 2,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_to_deliver, 2,
+                                  "Wrong qty to_deliver")
 
-        wizard = cls.rma_make_picking.with_context({
+        wizard = self.rma_make_picking.with_context({
             'active_id': 1,
-            'active_ids': cls.rma_customer_id.rma_line_ids.ids,
+            'active_ids': self.rma_customer_id.rma_line_ids.ids,
             'active_model': 'rma.order.line',
             'picking_type': 'outgoing',
         }).create({})
         wizard._create_picking()
-        res = cls.rma_customer_id.rma_line_ids.action_view_out_shipments()
-        cls.assertTrue('res_id' in res,
-                       "Incorrect number of pickings created")
-        picking = cls.env['stock.picking'].browse(res['res_id'])
+        res = self.rma_customer_id.rma_line_ids.action_view_out_shipments()
+        self.assertTrue('res_id' in res,
+                        "Incorrect number of pickings created")
+        picking = self.env['stock.picking'].browse(res['res_id'])
         moves = picking.move_lines
-        cls.assertEquals(len(moves), 3,
-                         "Incorrect number of moves created")
-        for line in cls.rma_customer_id.rma_line_ids:
-            cls.assertEquals(line.qty_to_receive, 0,
-                             "Wrong qty to receive")
-            cls.assertEquals(line.qty_incoming, 0,
-                             "Wrong qty incoming")
-            cls.assertEquals(line.qty_delivered, 0,
-                             "Wrong qty delivered")
-            if line.product_id == cls.product_1:
-                cls.assertEquals(line.qty_to_deliver, 3,
-                                 "Wrong qty to deliver")
-                cls.assertEquals(line.qty_outgoing, 3,
-                                 "Wrong qty outgoing")
-                cls.assertEquals(line.qty_received, 3,
-                                 "Wrong qty received")
-            if line.product_id == cls.product_2:
-                cls.assertEquals(line.qty_received, 5,
-                                 "Wrong qty received")
-                cls.assertEquals(line.qty_to_deliver, 5,
-                                 "Wrong qty to deliver")
-                cls.assertEquals(line.qty_outgoing, 5,
-                                 "Wrong qty outgoing")
-            if line.product_id == cls.product_3:
-                cls.assertEquals(line.qty_received, 2,
-                                 "Wrong qty received")
-                cls.assertEquals(line.qty_to_deliver, 2,
-                                 "Wrong qty to deliver")
-                cls.assertEquals(line.qty_outgoing, 2,
-                                 "Wrong qty outgoing")
+        self.assertEquals(len(moves), 3,
+                          "Incorrect number of moves created")
+        for line in self.rma_customer_id.rma_line_ids:
+            self.assertEquals(line.qty_to_receive, 0,
+                              "Wrong qty to receive")
+            self.assertEquals(line.qty_incoming, 0,
+                              "Wrong qty incoming")
+            self.assertEquals(line.qty_delivered, 0,
+                              "Wrong qty delivered")
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_to_deliver, 3,
+                                  "Wrong qty to deliver")
+                self.assertEquals(line.qty_outgoing, 3,
+                                  "Wrong qty outgoing")
+                self.assertEquals(line.qty_received, 3,
+                                  "Wrong qty received")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_received, 5,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_to_deliver, 5,
+                                  "Wrong qty to deliver")
+                self.assertEquals(line.qty_outgoing, 5,
+                                  "Wrong qty outgoing")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_received, 2,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_to_deliver, 2,
+                                  "Wrong qty to deliver")
+                self.assertEquals(line.qty_outgoing, 2,
+                                  "Wrong qty outgoing")
         picking.action_assign()
         for mv in picking.move_lines:
             mv.quantity_done = mv.product_uom_qty
         picking.action_done()
-        for line in cls.rma_customer_id.rma_line_ids:
-            cls.assertEquals(line.qty_to_receive, 0,
-                             "Wrong qty to receive")
-            cls.assertEquals(line.qty_incoming, 0,
-                             "Wrong qty incoming")
-            cls.assertEquals(line.qty_to_deliver, 0,
-                             "Wrong qty to deliver")
-            cls.assertEquals(line.qty_outgoing, 0,
-                             "Wrong qty outgoing")
-            if line.product_id == cls.product_1:
-                cls.assertEquals(line.qty_received, 3,
-                                 "Wrong qty received")
-                cls.assertEquals(line.qty_delivered, 3,
-                                 "Wrong qty delivered")
-            if line.product_id == cls.product_2:
-                cls.assertEquals(line.qty_received, 5,
-                                 "Wrong qty received")
-                cls.assertEquals(line.qty_delivered, 5,
-                                 "Wrong qty delivered")
-            if line.product_id == cls.product_3:
-                cls.assertEquals(line.qty_received, 2,
-                                 "Wrong qty received")
-                cls.assertEquals(line.qty_delivered, 2,
-                                 "Wrong qty delivered")
-            cls.line.action_rma_done()
-            cls.assertEquals(cls.line.state, 'done',
-                             "Wrong State")
-        cls.rma_customer_id.action_view_in_shipments()
-        cls.rma_customer_id.action_view_out_shipments()
-        cls.rma_customer_id.action_view_lines()
+        for line in self.rma_customer_id.rma_line_ids:
+            self.assertEquals(line.qty_to_receive, 0,
+                              "Wrong qty to receive")
+            self.assertEquals(line.qty_incoming, 0,
+                              "Wrong qty incoming")
+            self.assertEquals(line.qty_to_deliver, 0,
+                              "Wrong qty to deliver")
+            self.assertEquals(line.qty_outgoing, 0,
+                              "Wrong qty outgoing")
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_received, 3,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_delivered, 3,
+                                  "Wrong qty delivered")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_received, 5,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_delivered, 5,
+                                  "Wrong qty delivered")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_received, 2,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_delivered, 2,
+                                  "Wrong qty delivered")
+            self.line.action_rma_done()
+            self.assertEquals(self.line.state, 'done',
+                              "Wrong State")
+        self.rma_customer_id.action_view_in_shipments()
+        self.rma_customer_id.action_view_out_shipments()
+        self.rma_customer_id.action_view_lines()
 
     # DROPSHIP
-    def test_03_dropship(cls):
-        for line in cls.rma_droship_id.rma_line_ids:
+    def test_03_dropship(self):
+        for line in self.rma_droship_id.rma_line_ids:
             line.action_rma_to_approve()
             line.action_rma_approve()
             line._onchange_operation_id()
-        wizard = cls.rma_make_picking.with_context({
+        wizard = self.rma_make_picking.with_context({
             'active_id': 1,
-            'active_ids': cls.rma_droship_id.rma_line_ids.ids,
+            'active_ids': self.rma_droship_id.rma_line_ids.ids,
             'active_model': 'rma.order.line',
             'picking_type': 'incoming',
         }).create({})
         wizard._create_picking()
-        res = cls.rma_droship_id.rma_line_ids.action_view_in_shipments()
-        cls.assertTrue('res_id' in res,
-                       "Incorrect number of pickings created")
-        picking = cls.env['stock.picking'].browse(res['res_id'])
-        cls.assertEquals(len(picking), 1,
-                         "Incorrect number of pickings created")
+        res = self.rma_droship_id.rma_line_ids.action_view_in_shipments()
+        self.assertTrue('res_id' in res,
+                        "Incorrect number of pickings created")
+        picking = self.env['stock.picking'].browse(res['res_id'])
+        self.assertEquals(len(picking), 1,
+                          "Incorrect number of pickings created")
         moves = picking.move_lines
-        cls.assertEquals(len(moves), 3,
-                         "Incorrect number of moves created")
-        wizard = cls.make_supplier_rma.with_context({
-            'active_ids': cls.rma_droship_id.rma_line_ids.ids,
+        self.assertEquals(len(moves), 3,
+                          "Incorrect number of moves created")
+        wizard = self.make_supplier_rma.with_context({
+            'active_ids': self.rma_droship_id.rma_line_ids.ids,
             'active_model': 'rma.order.line',
             'active_id': 1
         }).create({})
         res = wizard.make_supplier_rma()
-        supplier_rma = cls.rma.browse(res['res_id'])
+        supplier_rma = self.rma.browse(res['res_id'])
         for line in supplier_rma.rma_line_ids:
             # common qtys for all products
-            cls.assertEquals(line.qty_received, 0,
-                             "Wrong qty received")
-            cls.assertEquals(line.qty_outgoing, 0,
-                             "Wrong qty incoming")
-            cls.assertEquals(line.qty_delivered, 0,
-                             "Wrong qty delivered")
+            self.assertEquals(line.qty_received, 0,
+                              "Wrong qty received")
+            self.assertEquals(line.qty_outgoing, 0,
+                              "Wrong qty incoming")
+            self.assertEquals(line.qty_delivered, 0,
+                              "Wrong qty delivered")
             # product specific
-            if line.product_id == cls.product_1:
-                cls.assertEquals(line.qty_to_deliver, 3,
-                                 "Wrong qty to deliver")
-            if line.product_id == cls.product_2:
-                cls.assertEquals(line.qty_to_deliver, 5,
-                                 "Wrong qty to deliver")
-            if line.product_id == cls.product_3:
-                cls.assertEquals(line.qty_to_deliver, 2,
-                                 "Wrong qty to deliver")
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_to_deliver, 3,
+                                  "Wrong qty to deliver")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_to_deliver, 5,
+                                  "Wrong qty to deliver")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_to_deliver, 2,
+                                  "Wrong qty to deliver")
 
-        for line in cls.rma_droship_id.rma_line_ids:
-            if line.product_id == cls.product_1:
-                cls.assertEquals(line.qty_to_supplier_rma, 0,
-                                 "Wrong qty to supplier rma")
-                cls.assertEquals(line.qty_in_supplier_rma, 3,
-                                 "Wrong qty in supplier rma")
-            if line.product_id == cls.product_2:
-                cls.assertEquals(line.qty_to_supplier_rma, 0,
-                                 "Wrong qty to supplier rma")
-                cls.assertEquals(line.qty_in_supplier_rma, 5,
-                                 "Wrong qty in supplier rma")
-            if line.product_id == cls.product_3:
-                cls.assertEquals(line.qty_to_supplier_rma, 0,
-                                 "Wrong qty to supplier rma")
-                cls.assertEquals(line.qty_in_supplier_rma, 2,
-                                 "Wrong qty in supplier rma")
-        for line in cls.rma_droship_id.rma_line_ids:
+        for line in self.rma_droship_id.rma_line_ids:
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_to_supplier_rma, 0,
+                                  "Wrong qty to supplier rma")
+                self.assertEquals(line.qty_in_supplier_rma, 3,
+                                  "Wrong qty in supplier rma")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_to_supplier_rma, 0,
+                                  "Wrong qty to supplier rma")
+                self.assertEquals(line.qty_in_supplier_rma, 5,
+                                  "Wrong qty in supplier rma")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_to_supplier_rma, 0,
+                                  "Wrong qty to supplier rma")
+                self.assertEquals(line.qty_in_supplier_rma, 2,
+                                  "Wrong qty in supplier rma")
+        for line in self.rma_droship_id.rma_line_ids:
             line.action_rma_done()
-            cls.assertEquals(line.state, 'done',
-                             "Wrong State")
+            self.assertEquals(line.state, 'done',
+                              "Wrong State")
 
     # Supplier RMA
-    def test_04_supplier_rma(cls):
-        wizard = cls.rma_make_picking.with_context({
-            'active_ids': cls.rma_supplier_id.rma_line_ids.ids,
+    def test_04_supplier_rma(self):
+        wizard = self.rma_make_picking.with_context({
+            'active_ids': self.rma_supplier_id.rma_line_ids.ids,
             'active_model': 'rma.order.line',
             'picking_type': 'outgoing',
             'active_id': 1
         }).create({})
         wizard._create_picking()
-        res = cls.rma_supplier_id.rma_line_ids.action_view_out_shipments()
-        cls.assertTrue('res_id' in res,
-                       "Incorrect number of pickings created")
-        picking = cls.env['stock.picking'].browse(res['res_id'])
+        res = self.rma_supplier_id.rma_line_ids.action_view_out_shipments()
+        self.assertTrue('res_id' in res,
+                        "Incorrect number of pickings created")
+        picking = self.env['stock.picking'].browse(res['res_id'])
         moves = picking.move_lines
-        cls.assertEquals(len(moves), 3,
-                         "Incorrect number of moves created")
-        for line in cls.rma_supplier_id.rma_line_ids:
+        self.assertEquals(len(moves), 3,
+                          "Incorrect number of moves created")
+        for line in self.rma_supplier_id.rma_line_ids:
             # common qtys for all products
-            cls.assertEquals(line.qty_received, 0,
-                             "Wrong qty received")
-            cls.assertEquals(line.qty_incoming, 0,
-                             "Wrong qty incoming")
-            cls.assertEquals(line.qty_delivered, 0,
-                             "Wrong qty delivered")
+            self.assertEquals(line.qty_received, 0,
+                              "Wrong qty received")
+            self.assertEquals(line.qty_incoming, 0,
+                              "Wrong qty incoming")
+            self.assertEquals(line.qty_delivered, 0,
+                              "Wrong qty delivered")
             # product specific
-            if line.product_id == cls.product_1:
-                cls.assertEquals(line.qty_to_receive, 3,
-                                 "Wrong qty to receive")
-                cls.assertEquals(line.qty_to_deliver, 3,
-                                 "Wrong qty to deliver")
-                cls.assertEquals(line.qty_outgoing, 3,
-                                 "Wrong qty outgoing")
-            if line.product_id == cls.product_2:
-                cls.assertEquals(line.qty_to_receive, 5,
-                                 "Wrong qty to receive")
-                cls.assertEquals(line.qty_to_deliver, 5,
-                                 "Wrong qty to deliver")
-                cls.assertEquals(line.qty_outgoing, 5,
-                                 "Wrong qty outgoing")
-            if line.product_id == cls.product_3:
-                cls.assertEquals(line.qty_to_receive, 2,
-                                 "Wrong qty to receive")
-                cls.assertEquals(line.qty_to_deliver, 2,
-                                 "Wrong qty to deliver")
-                cls.assertEquals(line.qty_outgoing, 2,
-                                 "Wrong qty outgoing")
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_to_receive, 3,
+                                  "Wrong qty to receive")
+                self.assertEquals(line.qty_to_deliver, 3,
+                                  "Wrong qty to deliver")
+                self.assertEquals(line.qty_outgoing, 3,
+                                  "Wrong qty outgoing")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_to_receive, 5,
+                                  "Wrong qty to receive")
+                self.assertEquals(line.qty_to_deliver, 5,
+                                  "Wrong qty to deliver")
+                self.assertEquals(line.qty_outgoing, 5,
+                                  "Wrong qty outgoing")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_to_receive, 2,
+                                  "Wrong qty to receive")
+                self.assertEquals(line.qty_to_deliver, 2,
+                                  "Wrong qty to deliver")
+                self.assertEquals(line.qty_outgoing, 2,
+                                  "Wrong qty outgoing")
 
         picking.action_assign()
         for mv in picking.move_lines:
             mv.quantity_done = mv.product_uom_qty
         picking.action_done()
-        for line in cls.rma_supplier_id.rma_line_ids:
-            cls.assertEquals(line.qty_incoming, 0,
-                             "Wrong qty incoming")
-            cls.assertEquals(line.qty_received, 0,
-                             "Wrong qty received")
-            if line.product_id == cls.product_1:
-                cls.assertEquals(line.qty_delivered, 3,
-                                 "Wrong qty delivered")
-                cls.assertEquals(line.qty_to_receive, 3,
-                                 "Wrong qty to receive")
-            if line.product_id == cls.product_2:
-                cls.assertEquals(line.qty_delivered, 5,
-                                 "Wrong qty delivered")
-                cls.assertEquals(line.qty_to_receive, 5,
-                                 "Wrong qty to receive")
-            if line.product_id == cls.product_3:
-                cls.assertEquals(line.qty_delivered, 2,
-                                 "Wrong qty delivered")
-                cls.assertEquals(line.qty_to_receive, 2,
-                                 "Wrong qty to receive")
-        wizard = cls.rma_make_picking.with_context({
+        for line in self.rma_supplier_id.rma_line_ids:
+            self.assertEquals(line.qty_incoming, 0,
+                              "Wrong qty incoming")
+            self.assertEquals(line.qty_received, 0,
+                              "Wrong qty received")
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_delivered, 3,
+                                  "Wrong qty delivered")
+                self.assertEquals(line.qty_to_receive, 3,
+                                  "Wrong qty to receive")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_delivered, 5,
+                                  "Wrong qty delivered")
+                self.assertEquals(line.qty_to_receive, 5,
+                                  "Wrong qty to receive")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_delivered, 2,
+                                  "Wrong qty delivered")
+                self.assertEquals(line.qty_to_receive, 2,
+                                  "Wrong qty to receive")
+        wizard = self.rma_make_picking.with_context({
             'active_id': 1,
-            'active_ids': cls.rma_supplier_id.rma_line_ids.ids,
+            'active_ids': self.rma_supplier_id.rma_line_ids.ids,
             'active_model': 'rma.order.line',
             'picking_type': 'incoming',
         }).create({})
         wizard._create_picking()
-        res = cls.rma_supplier_id.rma_line_ids.action_view_in_shipments()
-        cls.assertTrue('res_id' in res,
-                       "Incorrect number of pickings created")
-        pickings = cls.env['stock.picking'].browse(res['res_id'])
-        cls.assertEquals(len(pickings), 1,
-                         "Incorrect number of pickings created")
+        res = self.rma_supplier_id.rma_line_ids.action_view_in_shipments()
+        self.assertTrue('res_id' in res,
+                        "Incorrect number of pickings created")
+        pickings = self.env['stock.picking'].browse(res['res_id'])
+        self.assertEquals(len(pickings), 1,
+                          "Incorrect number of pickings created")
         picking_out = pickings[0]
         moves = picking_out.move_lines
-        cls.assertEquals(len(moves), 3,
-                         "Incorrect number of moves created")
-        for line in cls.rma_supplier_id.rma_line_ids:
-            cls.assertEquals(line.qty_incoming, 0,
-                             "Wrong qty incoming")
-            cls.assertEquals(line.qty_received, 0,
-                             "Wrong qty received")
-            cls.assertEquals(line.qty_to_deliver, 0,
-                             "Wrong qty to deliver")
-            if line.product_id == cls.product_1:
-                cls.assertEquals(line.qty_to_receive, 3,
-                                 "Wrong qty to receive")
-                cls.assertEquals(line.qty_incoming, 0,
-                                 "Wrong qty incoming")
-            if line.product_id == cls.product_2:
-                cls.assertEquals(line.qty_to_receive, 5,
-                                 "Wrong qty to receive")
-            if line.product_id == cls.product_3:
-                cls.assertEquals(line.qty_to_receive, 2,
-                                 "Wrong qty to receive")
+        self.assertEquals(len(moves), 3,
+                          "Incorrect number of moves created")
+        for line in self.rma_supplier_id.rma_line_ids:
+            self.assertEquals(line.qty_incoming, 0,
+                              "Wrong qty incoming")
+            self.assertEquals(line.qty_received, 0,
+                              "Wrong qty received")
+            self.assertEquals(line.qty_to_deliver, 0,
+                              "Wrong qty to deliver")
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_to_receive, 3,
+                                  "Wrong qty to receive")
+                self.assertEquals(line.qty_incoming, 0,
+                                  "Wrong qty incoming")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_to_receive, 5,
+                                  "Wrong qty to receive")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_to_receive, 2,
+                                  "Wrong qty to receive")
         picking_out.action_assign()
         for mv in picking.move_lines:
             mv.quantity_done = mv.product_uom_qty
         picking_out.action_done()
-        for line in cls.rma_supplier_id.rma_line_ids[0]:
-            cls.assertEquals(line.qty_to_receive, 3,
-                             "Wrong qty to receive")
-            cls.assertEquals(line.qty_incoming, 0,
-                             "Wrong qty incoming")
-            cls.assertEquals(line.qty_to_deliver, 0,
-                             "Wrong qty to deliver")
-            cls.assertEquals(line.qty_outgoing, 3,
-                             "Wrong qty outgoing")
-            if line.product_id == cls.product_1:
-                cls.assertEquals(line.qty_received, 0,
-                                 "Wrong qty received")
-                cls.assertEquals(line.qty_delivered, 3,
-                                 "Wrong qty delivered")
-            if line.product_id == cls.product_2:
-                cls.assertEquals(line.qty_received, 0,
-                                 "Wrong qty received")
-                cls.assertEquals(line.qty_delivered, 5,
-                                 "Wrong qty delivered")
-            if line.product_id == cls.product_3:
-                cls.assertEquals(line.qty_received, 2,
-                                 "Wrong qty received")
-                cls.assertEquals(line.qty_delivered, 2,
-                                 "Wrong qty delivered")
-        for line in cls.rma_supplier_id.rma_line_ids:
+        for line in self.rma_supplier_id.rma_line_ids[0]:
+            self.assertEquals(line.qty_to_receive, 3,
+                              "Wrong qty to receive")
+            self.assertEquals(line.qty_incoming, 0,
+                              "Wrong qty incoming")
+            self.assertEquals(line.qty_to_deliver, 0,
+                              "Wrong qty to deliver")
+            self.assertEquals(line.qty_outgoing, 3,
+                              "Wrong qty outgoing")
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_received, 0,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_delivered, 3,
+                                  "Wrong qty delivered")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_received, 0,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_delivered, 5,
+                                  "Wrong qty delivered")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_received, 2,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_delivered, 2,
+                                  "Wrong qty delivered")
+        for line in self.rma_supplier_id.rma_line_ids:
             line.action_rma_done()
-            cls.assertEquals(line.state, 'done',
-                             "Wrong State")
+            self.assertEquals(line.state, 'done',
+                              "Wrong State")