diff --git a/test/key_generator.py b/test/key_generator.py
index 0976c54a..28d8f7aa 100644
--- a/test/key_generator.py
+++ b/test/key_generator.py
@@ -2,11 +2,11 @@
 from random import randrange, choice
 
 class KeyStates(Enum):
-    KEY_PREACTIVE   = 0
-    KEY_ACTIVE      = 1
-    KEY_DEACTIVATED = 2
-    KEY_DESTROYED   = 3
-    KEY_CORRUPTED   = 4
+    KEY_PREACTIVE   = 1
+    KEY_ACTIVE      = 2
+    KEY_DEACTIVATED = 3
+    KEY_DESTROYED   = 4
+    KEY_CORRUPTED   = 5
 
 
 class New_Key:
@@ -17,10 +17,10 @@ def __init__(self, key:str = "", state:int = 0, index:int = 0, random:bool = Fal
         self.length = 0
         self.rand_length = rand_length
         self.key_bytes = []
-
+    
         i = 0
         if not random:
-            while(i < (len(key)-1)):
+            while(i < (len(self.key)-1)):
                 self.key_bytes.append("0x" + self.key[i] + self.key[i+1])
                 i += 2
             self.length = len(self.key_bytes)
@@ -29,11 +29,11 @@ def __init__(self, key:str = "", state:int = 0, index:int = 0, random:bool = Fal
 
     def _do_random(self):
         i = 0
-        if self.index == 0:
+        if not self.index:
             self.index = randrange(0,256,1)
-        if self.state == 0:
-            self.state = randrange(0,4,1)
-        if self.rand_length == 0:
+        if not self.state:
+            self.state = randrange(1,5,1)
+        if not self.rand_length:
             self.length = choice([16, 32, 64])
         else:
             self.length = self.rand_length
@@ -43,13 +43,15 @@ def _do_random(self):
                 self.key_bytes.append(("0x0" + hex(value).split('x')[1]))
             else:
                 self.key_bytes.append(hex(value))
+            self.key += self.key_bytes[i].split('x')[1]
             i += 1
 
     def print_keyring_entry(self):
+        print(f'// {self.index} - {self.key}')
         for i in range(self.length):
             print(f'key_ring[{self.index}].value[{i}] = {self.key_bytes[i]};')
         print(f'key_ring[{self.index}].key_len = {self.length};')
-        print(f'key_ring[{self.index}].key_state = {KeyStates(self.state).name};')
+        print(f'key_ring[{self.index}].key_state = {KeyStates(self.state).name};\n')
 
     def get_len(self):
         return self.length
@@ -66,9 +68,9 @@ def get_state(self):
     something.print_keyring_entry()
 
         # 2:
-        # something = New_Key(index=12, state=KeyStates.KEY_ACTIVE, random=True, rand_length=13)
-        # something.print_keyring_entry()
+    something = New_Key(index=12, state=KeyStates.KEY_ACTIVE, random=True, rand_length=13)
+    something.print_keyring_entry()
 
         # 3:
-        # something = New_Key(random=True)
-        # something.print_keyring_entry()
\ No newline at end of file
+    something = New_Key(random=True)
+    something.print_keyring_entry()
\ No newline at end of file