diff --git a/src/_cutecoin_test/models/account/test_account.py b/src/_cutecoin_test/models/account/test_account.py
index 7dd1bdd7029d38d49a9cf4bd9c04719bbbc7c6ad..88327b4a6a19948c7929073596ad1569b3d56887 100644
--- a/src/_cutecoin_test/models/account/test_account.py
+++ b/src/_cutecoin_test/models/account/test_account.py
@@ -4,57 +4,45 @@ from cutecoin.models.account import Account
 
 
 #TODO: Test account
-def test_account_create():
-    pass
+class Test_Account:
+    def test_account_create(self):
+        pass
 
+    def test_account_load(self):
+        pass
 
-def test_account_load():
-    pass
+    def test_account_add_wallet(self):
+        pass
 
+    def test_account_add_contact(self):
+        pass
 
-def test_account_add_wallet():
-    pass
+    def test_account_fingerprint(self):
+        pass
 
+    def test_account_transactions_received(self):
+        pass
 
-def test_account_add_contact():
-    pass
+    def test_account_transactions_sent(self):
+        pass
 
+    def test_account_last_issuances(self):
+        pass
 
-def test_account_fingerprint():
-    pass
+    def test_account_issued_last_dividend(self):
+        pass
 
+    def test_account_issue_dividend(self):
+        pass
 
-def test_account_transactions_received():
-    pass
+    def test_account_transfer_coins(self):
+        pass
 
+    def test_account_push_tht(self):
+        pass
 
-def test_account_transactions_sent():
-    pass
+    def test_account_pull_tht(self):
+        pass
 
-
-def test_account_last_issuances():
-    pass
-
-
-def test_account_issued_last_dividend():
-    pass
-
-
-def test_account_issue_dividend():
-    pass
-
-
-def test_account_transfer_coins():
-    pass
-
-
-def test_account_push_tht():
-    pass
-
-
-def test_account_pull_tht():
-    pass
-
-
-def test_account_quality():
-    pass
+    def test_account_quality(self):
+        pass
diff --git a/src/_cutecoin_test/models/account/test_communities.py b/src/_cutecoin_test/models/account/test_communities.py
index 0f02f64680be7a8d668bf9d1f9aecde3468ecdb8..dbde89db18d0a40b61babdbb61dd787b06cf3ce3 100644
--- a/src/_cutecoin_test/models/account/test_communities.py
+++ b/src/_cutecoin_test/models/account/test_communities.py
@@ -4,11 +4,11 @@ from cutecoin.models.account.communities import Communities
 
 
 #TODO: Test communities
-def test_communities_add_community():
-    pass
+class Test_Communities:
+    def test_communities_add_community(self):
+        pass
 
-
-def test_communities_jsonify():
-    pass
+    def test_communities_jsonify(self):
+        pass
 
 
diff --git a/src/_cutecoin_test/models/account/test_wallets.py b/src/_cutecoin_test/models/account/test_wallets.py
index dd036c79d0f1f0d67ec2fcea2a02c0af9a21a894..ce8ac5aa91bedfd3757e2a20290bbf90ec14dba3 100644
--- a/src/_cutecoin_test/models/account/test_wallets.py
+++ b/src/_cutecoin_test/models/account/test_wallets.py
@@ -3,18 +3,17 @@ import ucoinpy as ucoin
 from mock import Mock
 from cutecoin.models.account.wallets import Wallets
 
-#TODO: Test wallets
-def test_wallets_add_wallet():
-    pass
-
-
-def test_wallets_get_wallet():
-    pass
 
+#TODO: Test wallets
+class Test_Wallets:
+    def test_wallets_add_wallet(self):
+        pass
 
-def test_wallets_remove_all_wallets_of():
-    pass
+    def test_wallets_get_wallet(self):
+        pass
 
+    def test_wallets_remove_all_wallets_of(self):
+        pass
 
-def test_wallets_jsonify():
-    pass
+    def test_wallets_jsonify(self):
+        pass
diff --git a/src/_cutecoin_test/models/test_coin.py b/src/_cutecoin_test/models/test_coin.py
index 5c33f8dac4b3d0323c3466cbaaa1e89e10be9d86..eef1acd47029ef61de13b618e96257ff864ca3b6 100644
--- a/src/_cutecoin_test/models/test_coin.py
+++ b/src/_cutecoin_test/models/test_coin.py
@@ -14,21 +14,18 @@ origin = "A-2"
 def coin_id_regex():
     return re.compile("^([A-Z\d]{40})-(\d+)-(\d)-(\d+)-((A|F|D)-\d+)$")
 
-@pytest.mark.order1
-class Test_Coin:
 
+class Test_Coin:
     def test_coin_init(self, coin_id_regex):
         coin = Coin(issuer, number, base, power, origin)
         assert coin_id_regex.match(coin.get_id()) is not None
 
-
     def test_coin_from_id(self, coin_id_regex):
-        coin_id = issuer + "-" + number + "-" + base + "-" + power + "-" + origin
+        coin_id = issuer + "-" + str(number) + "-" + str(base) + "-" + str(power) + "-" + origin
         coin = Coin.from_id(coin_id)
         assert coin is not None
         assert coin_id_regex.match(coin.get_id()) is not None
 
-
     def test_coin_value(self):
         coin = Coin(issuer, number, base, power, origin)
-        assert coin.value() == 300
\ No newline at end of file
+        assert coin.value() == 300
diff --git a/src/_cutecoin_test/models/test_community.py b/src/_cutecoin_test/models/test_community.py
index 505bfaf47473d4f73e4348017cceff8920a55448..ccdd069a31cab8e8403a5cd8fe71718d6d4331ba 100644
--- a/src/_cutecoin_test/models/test_community.py
+++ b/src/_cutecoin_test/models/test_community.py
@@ -5,7 +5,6 @@ from cutecoin.models.community import Community
 from cutecoin.models.community import Node
 
 
-
 def patch_amendment_current_get(*args, **kwargs):
     return {
     "version": "1",
@@ -28,7 +27,6 @@ def patch_amendment_current_get(*args, **kwargs):
     }
 
 
-
 def patch_amendments_members_get(*args, **kwargs):
     return iter([{
     "hash": "2E69197FAB029D8669EF85E82457A1587CA0ED9C",
@@ -43,7 +41,6 @@ def patch_amendments_members_get(*args, **kwargs):
     "value": "3F69197FAB029D8669EF85E82457A1587CA0ED9C"
     }])
 
-    
 
 def patch_amendments_voters_get(*args, **kwargs):
     return iter([{
@@ -55,82 +52,90 @@ def patch_amendments_voters_get(*args, **kwargs):
     "value": "3F870197FAB029D8669EF85E82457A1587CA0ED9C"
     }])
 
-    
+
 @pytest.fixture
 def mock_node():
     def node_use(request):
         return request
-      
-    mock = Mock(spec=Node, trust=True, hoster=True, server = "192.168.100.10", port = 3800)
+
+    mock = Mock(spec=Node, trust=True, hoster=True,
+                server="192.168.100.10", port=3800)
     mock.getText.return_value = "Mock node"
     mock.use = node_use
     return mock
-    
+
 
 class Test_Community():
     def test_community_create(self, monkeypatch, mock_node):
-        monkeypatch.setattr(ucoin.hdc.amendments.Current, '__get__', patch_amendment_current_get)
+        monkeypatch.setattr(ucoin.hdc.amendments.Current,
+                            '__get__', patch_amendment_current_get)
         community = Community.create(mock_node)
         assert community is not None
-        
 
     def test_community_dividend(self, monkeypatch, mock_node):
-        monkeypatch.setattr(ucoin.hdc.amendments.Current, '__get__', patch_amendment_current_get)
+        monkeypatch.setattr(ucoin.hdc.amendments.Current,
+                            '__get__', patch_amendment_current_get)
         community = Community.create(mock_node)
         assert community.dividend() == 100
 
     def test_community_coin_minimal_power(self, monkeypatch, mock_node):
-        monkeypatch.setattr(ucoin.hdc.amendments.Current, '__get__', patch_amendment_current_get)
+        monkeypatch.setattr(ucoin.hdc.amendments.Current,
+                            '__get__', patch_amendment_current_get)
         community = Community.create(mock_node)
         assert community.coin_minimal_power() == 0
 
-
     def test_community_amendment_id(self, monkeypatch):
         pass
 
-
     def test_community_amendment_number(self, monkeypatch, mock_node):
-        monkeypatch.setattr(ucoin.hdc.amendments.Current, '__get__', patch_amendment_current_get)
+        monkeypatch.setattr(ucoin.hdc.amendments.Current,
+                            '__get__', patch_amendment_current_get)
         community = Community.create(mock_node)
         assert community.amendment_number() == 2
 
-
     def test_community_person_quality(self, monkeypatch, mock_node):
-        monkeypatch.setattr(ucoin.hdc.amendments.Current, '__get__', patch_amendment_current_get)
-        monkeypatch.setattr(ucoin.hdc.amendments.view.Members, '__get__', patch_amendments_members_get)
-        monkeypatch.setattr(ucoin.hdc.amendments.view.Voters, '__get__', patch_amendments_voters_get)
+        monkeypatch.setattr(ucoin.hdc.amendments.Current,
+                            '__get__', patch_amendment_current_get)
+        monkeypatch.setattr(ucoin.hdc.amendments.view.Members,
+                            '__get__', patch_amendments_members_get)
+        monkeypatch.setattr(ucoin.hdc.amendments.view.Voters,
+                            '__get__', patch_amendments_voters_get)
         community = Community.create(mock_node)
         assert community.person_quality("2E69197FAB029D8669EF85E82457A1587CA0ED9C") == "voter"
         assert community.person_quality("3F69197FAB029D8669EF85E82457A1587CA0ED9C") == "member"
         assert community.person_quality("3F870197FAB029D8669EF85E82457A1587CA0ED9C") == "voter"
         assert community.person_quality("3F871197FAB029D8669EF85E82457A1587CA0ED9C") == "nothing"
 
-
     def test_community_members_fingerprint(self, monkeypatch, mock_node):
-        monkeypatch.setattr(ucoin.hdc.amendments.Current, '__get__', patch_amendment_current_get)
-        monkeypatch.setattr(ucoin.hdc.amendments.view.Members, '__get__', patch_amendments_members_get)
-        monkeypatch.setattr(ucoin.hdc.amendments.view.Voters, '__get__', patch_amendments_voters_get)
+        monkeypatch.setattr(ucoin.hdc.amendments.Current,
+                            '__get__', patch_amendment_current_get)
+        monkeypatch.setattr(ucoin.hdc.amendments.view.Members,
+                            '__get__', patch_amendments_members_get)
+        monkeypatch.setattr(ucoin.hdc.amendments.view.Voters,
+                            '__get__', patch_amendments_voters_get)
         community = Community.create(mock_node)
-        
+
         assert "2E69197FAB029D8669EF85E82457A1587CA0ED9C" in community.members_fingerprints()
         assert "3F69197FAB029D8669EF85E82457A1587CA0ED9C" in community.members_fingerprints()
         assert "3F870197FAB029D8669EF85E82457A1587CA0ED9C" in community.members_fingerprints()
         assert "3F871197FAB029D8669EF85E82457A1587CA0ED9C"  not in community.members_fingerprints()
 
     def test_community_voters_fingerprint(self, monkeypatch, mock_node):
-        monkeypatch.setattr(ucoin.hdc.amendments.Current, '__get__', patch_amendment_current_get)
-        monkeypatch.setattr(ucoin.hdc.amendments.view.Members, '__get__', patch_amendments_members_get)
-        monkeypatch.setattr(ucoin.hdc.amendments.view.Voters, '__get__', patch_amendments_voters_get)
+        monkeypatch.setattr(ucoin.hdc.amendments.Current,
+                            '__get__', patch_amendment_current_get)
+        monkeypatch.setattr(ucoin.hdc.amendments.view.Members,
+                            '__get__', patch_amendments_members_get)
+        monkeypatch.setattr(ucoin.hdc.amendments.view.Voters,
+                            '__get__', patch_amendments_voters_get)
         community = Community.create(mock_node)
-        
+
         assert "2E69197FAB029D8669EF85E82457A1587CA0ED9C" in community.voters_fingerprints()
         assert "3F870197FAB029D8669EF85E82457A1587CA0ED9C" in community.voters_fingerprints()
         assert "3F871197FAB029D8669EF85E82457A1587CA0ED9C" not in community.voters_fingerprints()
 
-        
+    #TODO: Test community json
     def test_community_to_json(self):
         pass
 
-
     def test_community_from_json(self):
         pass
diff --git a/src/_cutecoin_test/models/test_node.py b/src/_cutecoin_test/models/test_node.py
index 719bd4fa0b6c92843ee34681e791b90b56c3a0a4..bd232b53953c16b08e4b7e1c5999e007c39ba6fd 100644
--- a/src/_cutecoin_test/models/test_node.py
+++ b/src/_cutecoin_test/models/test_node.py
@@ -5,60 +5,58 @@ from cutecoin.models.node import Node
 
 
 def patch_peers_get(*args, **kwargs):
-	return iter([{
-	"version": "1",
-	"currency": "beta_brousouf",
-	"fingerprint": "A70B8E8E16F91909B6A06DFB7EEF1651D9CCF468",
-	"dns": "DNS_VALUE",
-	"ipv4": "192.168.100.10",
-	"ipv6": "",
-	"port": "3800",
-	"signature": "-----BEGIN PGP SIGNATURE----- ... -----END PGP SIGNATURE-----"
-	},
-	{
-	"version": "1",
-	"currency": "beta_brousouf",
-	"fingerprint": "A70B8E8E16F91909B6A06DFB7EEF1651D9CCF469",
-	"dns": "DNS_VALUE",
-	"ipv4": "192.168.100.11",
-	"ipv6": "",
-	"port": "3801",
-	"signature": "-----BEGIN PGP SIGNATURE----- ... -----END PGP SIGNATURE-----"	
-	}])
-	
+    return iter([{
+    "version": "1",
+    "currency": "beta_brousouf",
+    "fingerprint": "A70B8E8E16F91909B6A06DFB7EEF1651D9CCF468",
+    "dns": "DNS_VALUE",
+    "ipv4": "192.168.100.10",
+    "ipv6": "",
+    "port": "3800",
+    "signature": "-----BEGIN PGP SIGNATURE----- ... -----END PGP SIGNATURE-----"
+    },
+    {
+    "version": "1",
+    "currency": "beta_brousouf",
+    "fingerprint": "A70B8E8E16F91909B6A06DFB7EEF1651D9CCF469",
+    "dns": "DNS_VALUE",
+    "ipv4": "192.168.100.11",
+    "ipv6": "",
+    "port": "3801",
+    "signature": "-----BEGIN PGP SIGNATURE----- ... -----END PGP SIGNATURE-----"
+    }])
 
 
 def patch_peer_get(*args, **kwargs):
-	return {
-	"version": "1",
-	"currency": "beta_brousouf",
-	"fingerprint": "A70B8E8E16F91909B6A06DFB7EEF1651D9CCF468",
-	"dns": "DNS_VALUE",
-	"ipv4": "192.168.100.10",
-	"ipv6": "",
-	"port": "3800",
-	"signature": "-----BEGIN PGP SIGNATURE----- ... -----END PGP SIGNATURE-----"
-	}
-	
-class Test_Node():
-	def test_peers(self, monkeypatch):
-
-		monkeypatch.setattr(ucoin.ucg.peering.Peers, '__get__', patch_peers_get)
+    return {
+    "version": "1",
+    "currency": "beta_brousouf",
+    "fingerprint": "A70B8E8E16F91909B6A06DFB7EEF1651D9CCF468",
+    "dns": "DNS_VALUE",
+    "ipv4": "192.168.100.10",
+    "ipv6": "",
+    "port": "3800",
+    "signature": "-----BEGIN PGP SIGNATURE----- ... -----END PGP SIGNATURE-----"
+    }
 
-		node = Node("192.168.100.12", 3800)
-		
-		assert (peer for peer in node.peers() if peer["ipv4"] == "192.168.100.10") 
-		assert (peer for peer in node.peers() if peer["ipv4"] == "192.168.100.11") 
 
+class Test_Node():
+    def test_peers(self, monkeypatch):
 
-	def test_peering(self, monkeypatch):
-		monkeypatch.setattr(ucoin.ucg.peering.Peer, '__get__', patch_peer_get)
+        monkeypatch.setattr(ucoin.ucg.peering.Peers,
+                              '__get__', patch_peers_get)
+        node = Node("192.168.100.12", 3800)
+        assert (peer for peer in node.peers() if peer["ipv4"] == "192.168.100.10")
+        assert (peer for peer in node.peers() if peer["ipv4"] == "192.168.100.11")
 
-		node = Node("192.168.100.12", 3800)
-		peering = node.peering()
-		assert peering["ipv4"] == "192.168.100.10"
-		assert peering["port"] == str(3800)
+    def test_peering(self, monkeypatch):
+        monkeypatch.setattr(ucoin.ucg.peering.Peer, '__get__', patch_peer_get)
 
+        node = Node("192.168.100.12", 3800)
+        peering = node.peering()
+        assert peering["ipv4"] == "192.168.100.10"
+        assert peering["port"] == str(3800)
 
-	def test_node_jsonify(self, monkeypatch):
-		pass
+    #TODO: Test node json
+    def test_node_jsonify(self, monkeypatch):
+        pass
diff --git a/src/_cutecoin_test/models/test_person.py b/src/_cutecoin_test/models/test_person.py
index 8924d9be8975bef32de4e3941396c9e50d9ad09c..4c285cd553cd06f6d7bfa616182d567bd81a4cd0 100644
--- a/src/_cutecoin_test/models/test_person.py
+++ b/src/_cutecoin_test/models/test_person.py
@@ -7,7 +7,7 @@ from cutecoin.models.community import Community
 
 @pytest.fixture
 def mock_lookup_get():
-        mock_get = Mock(spec = ucoin.pks.Lookup.__get__)
+        mock_get = Mock(spec=ucoin.pks.Lookup.__get__)
         mock_get.return_value = [
         {
           "signature": "-----BEGIN PGP SIGNATURE----- ... -----END PGP SIGNATURE-----",
@@ -33,15 +33,14 @@ def mock_lookup_get():
         }]
         return mock_get
 
+
 #TODO: Lookup for person after community was tested
 class Test_Person():
     def test_person_lookup(self, monkeypatch):
         pass
-        
 
     def test_person_jsonify(self):
         pass
 
-
     def test_person_from_json(self):
         pass
diff --git a/src/_cutecoin_test/models/test_wallet.py b/src/_cutecoin_test/models/test_wallet.py
index cc4d0f50c73b2267d2b5f104c4278727cc5125f0..e61e32a5442a15956e58fd2545225260235b95b2 100644
--- a/src/_cutecoin_test/models/test_wallet.py
+++ b/src/_cutecoin_test/models/test_wallet.py
@@ -4,6 +4,7 @@ from mock import Mock, patch
 from cutecoin.models.wallet import Wallet
 from cutecoin.models.community import Community, CommunityNetwork
 
+
 @pytest.fixture
 def mock_community():
     def community_request(request):
@@ -13,16 +14,17 @@ def mock_community():
             "coins": [{
               "issuer": "86F7E437FAA5A7FCE15D1DDCB9EAEAEA377667B8",
               "ids": ["1-5-2-A-1", "2-4-1-A-1"]
-            },{
+            },
+            {
               "issuer": "31A6302161AC8F5938969E85399EB3415C237F93",
               "ids": ["10-1-2-F-14"]
             }]
             }
         else:
                 assert 0
-    mock_network=Mock(spec=CommunityNetwork, request=community_request)
+    mock_network = Mock(spec=CommunityNetwork, request=community_request)
     community = Mock(spec=Community, network=mock_network)
-        
+
     return community
 
 
@@ -31,11 +33,10 @@ class Test_Wallet:
         wallet = Wallet([], mock_community)
         assert wallet is not None
 
-        
+    #TODO: Test json
     def test_wallet_load(self):
         pass
 
-
     def test_wallet_value(self, mock_community):
         wallet = Wallet([], mock_community)
         assert wallet.value() == 0
@@ -43,10 +44,8 @@ class Test_Wallet:
         assert wallet.value() == 640
         pass
 
-
     def test_wallet_get_text(self):
         pass
 
-
     def test_wallet_jsonify(self):
         pass