diff --git a/.github/workflows/dos-djgpp.yml b/.github/workflows/dos-djgpp.yml
index f267223..857543c 100644
--- a/.github/workflows/dos-djgpp.yml
+++ b/.github/workflows/dos-djgpp.yml
@@ -109,10 +109,13 @@ jobs:
           cat > dosbox_test/test.bat << EOL
           @echo off
           echo Running test 1...
-          umskt.exe -b 2C -c 365 -s 069420 > TEST1.TXT
+          umskt.exe -b 2C -c 365 -s 069420,999999 > TEST1.TXT
           if errorlevel 1 goto error
           echo Running test 2...
-          umskt.exe -i 253286028742154311079061239762245184619981623171292574 > TEST2.TXT
+          umskt.exe -b 5A -c 640 -s 069420,999999 > TEST2.TXT
+          if errorlevel 1 goto error
+          echo Running test 3...
+          umskt.exe -i 253286028742154311079061239762245184619981623171292574 > TEST3.TXT
           if errorlevel 1 goto error
           echo Tests completed > DONE.TXT
           goto end
@@ -154,21 +157,28 @@ jobs:
               echo "Test 2 output:"
               cat TEST2.TXT
             fi
+            if [ -f TEST3.TXT ]; then
+              echo "Test 3 output:"
+              cat TEST3.TXT
+            fi
             exit 1
           fi
           # Verify test outputs
-          if [ ! -f TEST1.TXT ] || [ ! -f TEST2.TXT ]; then
+          if [ ! -f TEST1.TXT ] || [ ! -f TEST2.TXT ] || [ ! -f TEST3.TXT ]; then
             echo "Test output files missing"
             exit 1
           fi
           # Check test results - looking for key format patterns
           if ! grep -qE '[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}' TEST1.TXT || \
-             ! grep -qE '[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}' TEST2.TXT; then
+             ! grep -qE '[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}' TEST2.TXT || \
+             ! grep -qE '[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}' TEST3.TXT; then
             echo "Tests failed - unexpected output format"
             echo "Test 1 output:"
             cat TEST1.TXT
             echo "Test 2 output:"
             cat TEST2.TXT
+            echo "Test 3 output:"
+            cat TEST3.txt
             exit 1
           else
             echo "All tests passed successfully"
@@ -176,6 +186,8 @@ jobs:
             cat TEST1.TXT
             echo "Test 2 output:"
             cat TEST2.TXT
+            echo "Test 3 output:"
+            cat TEST3.TXT
           fi
 
       - name: Move executable to upload directory
@@ -226,10 +238,13 @@ jobs:
           cat > dosbox_test/test.bat << EOL
           @echo off
           echo Running test 1...
-          umskt.exe -b 2C -c 365 -s 069420 > TEST1.TXT
+          umskt.exe -b 2C -c 365 -s 069420,999999 > TEST1.TXT
           if errorlevel 1 goto error
           echo Running test 2...
-          umskt.exe -i 253286028742154311079061239762245184619981623171292574 > TEST2.TXT
+          umskt.exe -b 5A -c 640 -s 069420,999999 > TEST2.TXT
+          if errorlevel 1 goto error
+          echo Running test 3...
+          umskt.exe -i 253286028742154311079061239762245184619981623171292574 > TEST3.TXT
           if errorlevel 1 goto error
           echo Tests completed > DONE.TXT
           goto end
@@ -272,21 +287,28 @@ jobs:
               echo "Test 2 output:"
               cat TEST2.TXT
             fi
+            if [ -f TEST3.TXT ]; then
+              echo "Test 3 output:"
+              cat TEST3.TXT
+            fi
             exit 1
           fi
           # Verify test outputs
-          if [ ! -f TEST1.TXT ] || [ ! -f TEST2.TXT ]; then
+          if [ ! -f TEST1.TXT ] || [ ! -f TEST2.TXT ] || [ ! -f TEST3.TXT ]; then
             echo "Test output files missing"
             exit 1
           fi
           # Check test results - looking for key format patterns
           if ! grep -qE '[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}' TEST1.TXT || \
-             ! grep -qE '[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}' TEST2.TXT; then
+             ! grep -qE '[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}' TEST2.TXT || \
+             ! grep -qE '[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}' TEST3.TXT; then
             echo "Tests failed - unexpected output format"
             echo "Test 1 output:"
             cat TEST1.TXT
             echo "Test 2 output:"
             cat TEST2.TXT
+            echo "Test 3 output:"
+            cat TEST3.txt
             exit 1
           else
             echo "All tests passed successfully"
@@ -294,6 +316,8 @@ jobs:
             cat TEST1.TXT
             echo "Test 2 output:"
             cat TEST2.TXT
+            echo "Test 3 output:"
+            cat TEST3.TXT
           fi
 
       - name: Move executable to upload directory
diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
index e2ef6e5..c8f7b21 100644
--- a/.github/workflows/freebsd.yml
+++ b/.github/workflows/freebsd.yml
@@ -51,8 +51,10 @@
            cd build 
            cmake .. 
            make 
-           echo Test 1 - generating key
-           ./umskt -b 2C -c 365 -s 069420 -v
+           echo Test 1 - generating key (BINK1998)
+           ./umskt -b 2C -c 365 -s 069420,999999 -v
+           echo Test 2 - generating key (BINK2002)
+           ./umskt -b 5A -c 640 -s 069420,999999 -v
            echo Test 2 - generating confid
            ./umskt -i 253286028742154311079061239762245184619981623171292574
   
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 73a07a3..a212a68 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -86,9 +86,11 @@ jobs:
       if: ${{ matrix.use_alpine }}
       run: |
         cd build
-        echo Test 1 - generating key
-        ./umskt -b 2C -c 365 -s 069420 -v
-        echo Test 2 - generating confid
+        echo Test 1 - generating key \(BINK1998\)
+        ./umskt -b 2C -c 365 -s 069420,999999 -v
+        echo Test 2 - generating key \(BINK2002\)
+        ./umskt -b 5A -c 640 -s 069420,999999 -v
+        echo Test 3 - generating confid
         ./umskt -i 253286028742154311079061239762245184619981623171292574
       shell: alpine-target.sh {0}
 
@@ -96,9 +98,11 @@ jobs:
       if: ${{ !matrix.use_alpine }}
       run: |
         cd build
-        echo Test 1 - generating key
-        ./umskt -b 2C -c 365 -s 069420 -v
-        echo Test 2 - generating confid
+        echo Test 1 - generating key \(BINK1998\)
+        ./umskt -b 2C -c 365 -s 069420,999999 -v
+        echo Test 2 - generating key \(BINK2002\)
+        ./umskt -b 5A -c 640 -s 069420,999999 -v
+        echo Test 3 - generating confid
         ./umskt -i 253286028742154311079061239762245184619981623171292574
 
     - name: Move files to correct directory
@@ -131,9 +135,11 @@ jobs:
       if: ${{ matrix.use_alpine }}
       run: |
         cd build
-        echo Test 1 - generating key
-        ./umskt -b 2C -c 365 -s 069420 -v
-        echo Test 2 - generating confid
+        echo Test 1 - generating key \(BINK1998\)
+        ./umskt -b 2C -c 365 -s 069420,999999 -v
+        echo Test 2 - generating key \(BINK2002\)
+        ./umskt -b 5A -c 640 -s 069420,999999 -v
+        echo Test 3 - generating confid
         ./umskt -i 253286028742154311079061239762245184619981623171292574
       shell: alpine-target.sh {0}
 
@@ -141,9 +147,11 @@ jobs:
       if: ${{ !matrix.use_alpine }}
       run: |
         cd build
-        echo Test 1 - generating key
-        ./umskt -b 2C -c 365 -s 069420 -v
-        echo Test 2 - generating confid
+        echo Test 1 - generating key \(BINK1998\)
+        ./umskt -b 2C -c 365 -s 069420,999999 -v
+        echo Test 2 - generating key \(BINK2002\)
+        ./umskt -b 5A -c 640 -s 069420,999999 -v
+        echo Test 3 - generating confid
         ./umskt -i 253286028742154311079061239762245184619981623171292574
 
     - name: Configure and build shared deps UMSKT (Alpine)
@@ -165,9 +173,11 @@ jobs:
       if: ${{ matrix.use_alpine }}
       run: |
         cd build
-        echo Test 1 - generating key
-        ./umskt -b 2C -c 365 -s 069420 -v
-        echo Test 2 - generating confid
+        echo Test 1 - generating key \(BINK1998\)
+        ./umskt -b 2C -c 365 -s 069420,999999 -v
+        echo Test 2 - generating key \(BINK2002\)
+        ./umskt -b 5A -c 640 -s 069420,999999 -v
+        echo Test 3 - generating confid
         ./umskt -i 253286028742154311079061239762245184619981623171292574
       shell: alpine-target.sh {0}
 
@@ -175,7 +185,9 @@ jobs:
       if: ${{ !matrix.use_alpine }}
       run: |
         cd build
-        echo Test 1 - generating key
-        ./umskt -b 2C -c 365 -s 069420 -v
-        echo Test 2 - generating confid
+        echo Test 1 - generating key \(BINK1998\)
+        ./umskt -b 2C -c 365 -s 069420,999999 -v
+        echo Test 2 - generating key \(BINK2002\)
+        ./umskt -b 5A -c 640 -s 069420,999999 -v
+        echo Test 3 - generating confid
         ./umskt -i 253286028742154311079061239762245184619981623171292574
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 80b87f4..44b331d 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -86,9 +86,11 @@ jobs:
       - name: Run tests
         run: |
           cd build/actions_upload
-          echo Test 1 - generating key
-          ./umskt -b 2C -c 365 -s 069420 -v
-          echo Test 2 - generating confid
+          echo Test 1 - generating key \(BINK1998\)
+          ./umskt -b 2C -c 365 -s 069420,999999 -v
+          echo Test 2 - generating key \(BINK2002\)
+          ./umskt -b 5A -c 640 -s 069420,999999 -v
+          echo Test 3 - generating confid
           ./umskt -i 253286028742154311079061239762245184619981623171292574
 
       - name: Upload platform-specific build
diff --git a/.github/workflows/windows-arm.yml b/.github/workflows/windows-arm.yml
index a0399c5..99c5886 100644
--- a/.github/workflows/windows-arm.yml
+++ b/.github/workflows/windows-arm.yml
@@ -138,7 +138,9 @@ jobs:
       - name: Run tests
         shell: pwsh
         run: |
-          Write-Host Test 1 - generating key
-          .\umskt.exe -b 2C -c 365 -s 069420 -v
-          Write-Host Test 2 - generatng confid
+          Write-Host Test 1 - generating key `(BINK1998`)
+          .\umskt.exe -b 2C -c 365 -s 069420,999999 -v
+          Write-Host Test 2 - generating key `(BINK2002`)
+          .\umskt.exe -b 5A -c 640 -s 069420,999999 -v
+          Write-Host Test 3 - generatng confid
           .\umskt.exe -i 253286028742154311079061239762245184619981623171292574 
diff --git a/.github/workflows/windows-x86-x64.yml b/.github/workflows/windows-x86-x64.yml
index 9afa794..b64b3ab 100644
--- a/.github/workflows/windows-x86-x64.yml
+++ b/.github/workflows/windows-x86-x64.yml
@@ -223,9 +223,11 @@ jobs:
       - name: Run tests
         shell: pwsh
         run: |
-          Write-Host Test 1 - generating key
-          .\umskt.exe -b 2C -c 365 -s 069420 -v
-          Write-Host Test 2 - generatng confid
+          Write-Host Test 1 - generating key `(BINK1998`)
+          .\umskt.exe -b 2C -c 365 -s 069420,999999 -v
+          Write-Host Test 2 - generating key `(BINK2002`)
+          .\umskt.exe -b 5A -c 640 -s 069420,999999 -v
+          Write-Host Test 3 - generatng confid
           .\umskt.exe -i 253286028742154311079061239762245184619981623171292574 
           
       - name: Upload build artifact