diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f978387..2b6be01 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,8 +18,8 @@ jobs:
         run: make
       - name: Test binary
         run: |
-          ./aastuff
-          ./aastuff_standalone
+          ./aastuff -h
+          ./aastuff_standalone -h
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -60,6 +60,7 @@ jobs:
           unzip -p tests/iPhone_15PM_18.0_22A5282m.ipsw 090-29713-049.dmg.aea > tests/iOS_18_beta_1_IPSW/encrypted.aea
           rm tests/iPhone_15PM_18.0_22A5282m.ipsw
           printf "$IOS_IPSW_TEST_KEY" > tests/iOS_18_beta_1_IPSW/expected.txt
+          touch tests/iOS_18_beta_1_IPSW/fast_unsupported
         env:
           MACOS_OTA_TEST_KEY: ${{ vars.MACOS_OTA_TEST_KEY }}
           IOS_IPSW_TEST_KEY: ${{ vars.IOS_IPSW_TEST_KEY }}
@@ -86,11 +87,13 @@ jobs:
           # This file uses a compressed inner layer 
           # curl -L "https://updates.cdn-apple.com/2024/Iris/mobileassets/003-49672/A1233F60-3D17-491B-803A-DB26E20695AE/com_apple_MobileAsset_UAF_Siri_Understanding/6FF3BAF0-FBEF-4C01-BB0E-30CD61DAFCC4.aar" -o tests/small/encrypted.aea
           aria2c -x 16 -s 16 -j 16 --file-allocation=none "https://updates.cdn-apple.com/2024/Iris/mobileassets/003-49672/A1233F60-3D17-491B-803A-DB26E20695AE/com_apple_MobileAsset_UAF_Siri_Understanding/6FF3BAF0-FBEF-4C01-BB0E-30CD61DAFCC4.aar" -o tests/small/encrypted.aea
-          printf "$SMALL_TEST_KEY" > tests/small/key.txt
+          printf "$SMALL_TEST_KEY" > tests/small/expected.txt
+          printf "YEC,UID,GID,MOD,SH2" > tests/small/flags.txt
           # This file uses a raw inner layer
           # curl -L "https://updates.cdn-apple.com/2024SummerSeed/mobileassets/052-49061/CA7135A8-BAF6-4890-887C-35FB30C154D5/com_apple_MobileAsset_MacSoftwareUpdate/e2de87f20576b2bdc021d36f74a2f836cf42afe576178388dfd0cde875f4f979.aea" -o tests/large/encrypted.aea
           aria2c -x 16 -s 16 -j 16 --file-allocation=none "https://updates.cdn-apple.com/2024SummerSeed/mobileassets/052-49061/CA7135A8-BAF6-4890-887C-35FB30C154D5/com_apple_MobileAsset_MacSoftwareUpdate/e2de87f20576b2bdc021d36f74a2f836cf42afe576178388dfd0cde875f4f979.aea" -o tests/large/encrypted.aea
-          printf "$LARGE_TEST_KEY" > tests/large/key.txt
+          printf "$LARGE_TEST_KEY" > tests/large/expected.txt
+          printf "LNK,FLG,UID,GID,MOD,MTM,CTM" > tests/large/flags.txt
         env:
           SMALL_TEST_KEY: ${{ vars.SMALL_TEST_KEY }}
           LARGE_TEST_KEY: ${{ vars.LARGE_TEST_KEY }}
diff --git a/test_extract.sh b/test_extract.sh
index 51cda4c..7dce0c2 100755
--- a/test_extract.sh
+++ b/test_extract.sh
@@ -20,16 +20,17 @@ mkdir -p tmp
 
 for i in tests/*; do
     i=$(basename "$i")
+    TEST_DIR="tests/$i"
+    TMP_DIR="tmp/$i"
+
     echo "Testing $i"
-    if [ -f "tests/$i/skip_extract" ]; then
+
+    if [ -f "$TEST_DIR/skip_extract" ]; then
         echo "Skipping $i"
         echo ""
         continue
     fi
 
-    TEST_DIR="tests/$i"
-    TMP_DIR="tmp/$i"
-
     mkdir -p "$TMP_DIR/a" "$TMP_DIR/b"
 
     ret=0
diff --git a/test_get_key.sh b/test_get_key.sh
index 3ad5501..3a0f65f 100755
--- a/test_get_key.sh
+++ b/test_get_key.sh
@@ -22,20 +22,21 @@ mkdir tmp
 
 for i in tests/*; do
     i=$(basename "$i")
+    TEST_DIR="tests/$i"
+    TMP_DIR="tmp/$i"
+
     echo "Testing $i"
-    if [ -e "tests/$i/skip_get_key" ]; then
+
+    if [ -e "$TEST_DIR/skip_get_key" ]; then
         echo "Skipping $i"
         echo ""
         continue
     fi
 
-    if [ -e "test/$i/fast_unsupported" ]; then
+    if [ -e "$TEST_DIR/fast_unsupported" ]; then
         FAST=0
     fi
 
-    TEST_DIR="tests/$i"
-    TMP_DIR="tmp/$i"
-
     mkdir -p "$TMP_DIR"
 
     ret=0