diff --git a/tests/test_fe_form.py b/tests/test_fe_form.py
index a7cfdc7..eb72ae1 100644
--- a/tests/test_fe_form.py
+++ b/tests/test_fe_form.py
@@ -25,18 +25,24 @@ def simple_invoice_without_lines():
     inv.set_supplier(form.Party(
         name = 'facho-supplier',
         ident = form.PartyIdentification('123','', '31'),
-        responsability_code = form.Responsability(['ZZ']),
+        responsability_code = form.Responsability(['O-07']),
         responsability_regime_code = '48',
         organization_code = '1',
-        address = form.Address(name='Test Building')
+        address = form.Address(
+            '', '', form.City('05001', 'Medellín'),
+            form.Country('CO', 'Colombia'),
+            form.CountrySubentity('05', 'Antioquia'))
     ))
     inv.set_customer(form.Party(
         name = 'facho-customer',
         ident = form.PartyIdentification('321', '', '31'),
-        responsability_code = form.Responsability(['ZZ']),
+        responsability_code = form.Responsability(['O-07']),
         responsability_regime_code = '48',
         organization_code = '1',
-        address = form.Address(name='Test Building')
+        address = form.Address(
+            '', '', form.City('05001', 'Medellín'),
+            form.Country('CO', 'Colombia'),
+            form.CountrySubentity('05', 'Antioquia'))
     ))
     return inv
 
@@ -51,16 +57,24 @@ def simple_invoice():
     inv.set_supplier(form.Party(
         name = 'facho-supplier',
         ident = form.PartyIdentification('123','', '31'),
-        responsability_code = form.Responsability(['ZZ']),
+        responsability_code = form.Responsability(['O-07']),
         responsability_regime_code = '48',
-        organization_code = '1'
+        organization_code = '1',
+        address = form.Address(
+            '', '', form.City('05001', 'Medellín'),
+            form.Country('CO', 'Colombia'),
+            form.CountrySubentity('05', 'Antioquia'))
     ))
     inv.set_customer(form.Party(
         name = 'facho-customer',
         ident = form.PartyIdentification('321','', '31'),
-        responsability_code = form.Responsability(['ZZ']),
+        responsability_code = form.Responsability(['O-07']),
         responsability_regime_code = '48',
-        organization_code = '1'
+        organization_code = '1',
+        address = form.Address(
+            '', '', form.City('05001', 'Medellín'),
+            form.Country('CO', 'Colombia'),
+            form.CountrySubentity('05', 'Antioquia'))
     ))
     inv.add_invoice_line(form.InvoiceLine(
         quantity = 1,