diff --git a/libsrc/ffdec_lib/testdata/as3_new/assets/data.bin b/libsrc/ffdec_lib/testdata/as3_embed/assets/data.bin
similarity index 100%
rename from libsrc/ffdec_lib/testdata/as3_new/assets/data.bin
rename to libsrc/ffdec_lib/testdata/as3_embed/assets/data.bin
diff --git a/libsrc/ffdec_lib/testdata/as3_new/assets/font.ttf b/libsrc/ffdec_lib/testdata/as3_embed/assets/font.ttf
similarity index 100%
rename from libsrc/ffdec_lib/testdata/as3_new/assets/font.ttf
rename to libsrc/ffdec_lib/testdata/as3_embed/assets/font.ttf
diff --git a/libsrc/ffdec_lib/testdata/as3_new/assets/image.png b/libsrc/ffdec_lib/testdata/as3_embed/assets/image.png
similarity index 100%
rename from libsrc/ffdec_lib/testdata/as3_new/assets/image.png
rename to libsrc/ffdec_lib/testdata/as3_embed/assets/image.png
diff --git a/libsrc/ffdec_lib/testdata/as3_new/assets/image.svg b/libsrc/ffdec_lib/testdata/as3_embed/assets/image.svg
similarity index 100%
rename from libsrc/ffdec_lib/testdata/as3_new/assets/image.svg
rename to libsrc/ffdec_lib/testdata/as3_embed/assets/image.svg
diff --git a/libsrc/ffdec_lib/testdata/as3_new/assets/image_grid.png b/libsrc/ffdec_lib/testdata/as3_embed/assets/image_grid.png
similarity index 100%
rename from libsrc/ffdec_lib/testdata/as3_new/assets/image_grid.png
rename to libsrc/ffdec_lib/testdata/as3_embed/assets/image_grid.png
diff --git a/libsrc/ffdec_lib/testdata/as3_new/assets/movie.swf b/libsrc/ffdec_lib/testdata/as3_embed/assets/movie.swf
similarity index 100%
rename from libsrc/ffdec_lib/testdata/as3_new/assets/movie.swf
rename to libsrc/ffdec_lib/testdata/as3_embed/assets/movie.swf
diff --git a/libsrc/ffdec_lib/testdata/as3_new/assets/movie_singleframe.swf b/libsrc/ffdec_lib/testdata/as3_embed/assets/movie_singleframe.swf
similarity index 100%
rename from libsrc/ffdec_lib/testdata/as3_new/assets/movie_singleframe.swf
rename to libsrc/ffdec_lib/testdata/as3_embed/assets/movie_singleframe.swf
diff --git a/libsrc/ffdec_lib/testdata/as3_new/assets/sound.mp3 b/libsrc/ffdec_lib/testdata/as3_embed/assets/sound.mp3
similarity index 100%
rename from libsrc/ffdec_lib/testdata/as3_new/assets/sound.mp3
rename to libsrc/ffdec_lib/testdata/as3_embed/assets/sound.mp3
diff --git a/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed.air.swf b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed.air.swf
new file mode 100644
index 000000000..348feacb6
Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed.air.swf differ
diff --git a/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed.flex.swf b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed.flex.swf
new file mode 100644
index 000000000..0c7b0774c
Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed.flex.swf differ
diff --git a/libsrc/ffdec_lib/testdata/as3_embed/build_air_debug.bat b/libsrc/ffdec_lib/testdata/as3_embed/build_air_debug.bat
new file mode 100644
index 000000000..0ee0643ea
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/as3_embed/build_air_debug.bat
@@ -0,0 +1,5 @@
+@echo off
+set COMPILERKIND=air
+set SWFNAME=as3_embed
+call c:\air\bin\mxmlc.bat -debug=true -output bin/%SWFNAME%.%COMPILERKIND%.swf src/MainAir.as 1> buildlog.%COMPILERKIND%.txt 2>&1
+rem -warnings=false
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/as3_embed/build_both_debug.bat b/libsrc/ffdec_lib/testdata/as3_embed/build_both_debug.bat
new file mode 100644
index 000000000..d84078bd2
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/as3_embed/build_both_debug.bat
@@ -0,0 +1,3 @@
+@echo off
+call build_flex_debug.bat
+call build_air_debug.bat
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/as3_embed/build_flex_debug.bat b/libsrc/ffdec_lib/testdata/as3_embed/build_flex_debug.bat
new file mode 100644
index 000000000..126a524a0
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/as3_embed/build_flex_debug.bat
@@ -0,0 +1,5 @@
+@echo off
+set COMPILERKIND=flex
+set SWFNAME=as3_embed
+c:\flex\bin\mxmlc.exe -debug=true -output bin/%SWFNAME%.%COMPILERKIND%.swf src/MainFlex.as 1> buildlog.%COMPILERKIND%.txt 2>&1
+rem -warnings=false
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/MainAir.as b/libsrc/ffdec_lib/testdata/as3_embed/src/MainAir.as
new file mode 100644
index 000000000..a8b716cf1
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/as3_embed/src/MainAir.as
@@ -0,0 +1,30 @@
+package
+{
+    import flash.display.Sprite;
+    import flash.events.Event;
+    import tests_classes.TestEmbedAir;
+    
+    /**
+     * ...
+     * @author JPEXS
+     */
+    public class MainAir extends Sprite
+    {        
+        
+        TestEmbedAir;
+        
+        public function MainAir()
+        {
+            if (stage) init();
+            else addEventListener(Event.ADDED_TO_STAGE, init);
+        }
+        
+        private function init(e:Event = null):void
+        {
+            removeEventListener(Event.ADDED_TO_STAGE, init);
+            // entry point
+        }    
+    
+    }
+
+}
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/MainFlex.as b/libsrc/ffdec_lib/testdata/as3_embed/src/MainFlex.as
new file mode 100644
index 000000000..e00fdbfec
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/as3_embed/src/MainFlex.as
@@ -0,0 +1,30 @@
+package
+{
+    import flash.display.Sprite;
+    import flash.events.Event;
+    import tests_classes.TestEmbedFlex;
+    
+    /**
+     * ...
+     * @author JPEXS
+     */
+    public class MainFlex extends Sprite
+    {        
+        
+        TestEmbedFlex;
+        
+        public function MainFlex()
+        {
+            if (stage) init();
+            else addEventListener(Event.ADDED_TO_STAGE, init);
+        }
+        
+        private function init(e:Event = null):void
+        {
+            removeEventListener(Event.ADDED_TO_STAGE, init);
+            // entry point
+        }    
+    
+    }
+
+}
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/tests_classes/TestEmbedAir.as b/libsrc/ffdec_lib/testdata/as3_embed/src/tests_classes/TestEmbedAir.as
new file mode 100644
index 000000000..6e2516a29
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/as3_embed/src/tests_classes/TestEmbedAir.as
@@ -0,0 +1,66 @@
+package tests_classes
+{ 
+    import flash.display.Sprite; 
+    import flash.media.Sound;
+    import flash.display.Bitmap;
+    import flash.display.MovieClip;
+    import flash.media.Sound;
+    import flash.utils.ByteArray;
+ 
+    public class TestEmbedAir extends Sprite 
+    { 
+        [Embed(source="../../assets/image.png")] 
+        public var imagePngClass:Class;
+        
+        [Embed(source="../../assets/image.png")] 
+        public var sameImageClass:Class; 
+        
+        [Embed(source="../../assets/image_grid.png", scaleGridTop="10", scaleGridBottom="40", 
+                scaleGridLeft="10", scaleGridRight="70")] 
+        public var imageGridPngClass:Class;
+                
+        //deprecated in Flex, not supported in AIR
+        //[Embed(source="../../assets/image.svg")]
+        //public var imageSvgClass:Class;
+        
+        [Embed(source="../../assets/movie.swf")]
+        public var movieSwfClass:Class;
+        
+        [Embed(source="../../assets/movie_singleframe.swf")]
+        public var movieSingleFrameSwfClass:Class;
+        
+        [Embed(source="../../assets/sound.mp3")] 
+        public var soundClass:Class; 
+        
+        //not supported in Flex, AIR only
+        [Embed(source="../../assets/font.ttf", fontFamily="Great Vibes", fontWeight= "normal", fontStyle = "normal", mimeType="application/x-font-truetype")]
+        private var fontClass:Class;
+                
+        [Embed(source="../../assets/data.bin", mimeType="application/octet-stream")] 
+        public var binaryDataClass:Class;                 
+        
+        
+        
+         
+        public function TestEmbedAir()
+        { 
+            var someBitmap:Bitmap = new imagePngClass() as Bitmap;
+            trace("Dimensions: " + someBitmap.width + "x" + someBitmap.height);
+            
+            var someGridSprite:Sprite = new imageGridPngClass() as Sprite;            
+            
+            //var someSprite:Sprite = new imageSvgClass() as Sprite;
+            
+            var someMovieClip:MovieClip = new movieSwfClass() as MovieClip;
+            
+            var someSpriteSwf:Sprite = new movieSingleFrameSwfClass() as Sprite;
+            
+            var someSound:Sound = new soundClass() as Sound; 
+            someSound.play(); 
+            
+            var someData:ByteArray = new binaryDataClass() as ByteArray;
+            trace("Length: " + someData.length); 
+            
+        } 
+    } 
+}
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/TestEmbed.as b/libsrc/ffdec_lib/testdata/as3_embed/src/tests_classes/TestEmbedFlex.as
similarity index 92%
rename from libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/TestEmbed.as
rename to libsrc/ffdec_lib/testdata/as3_embed/src/tests_classes/TestEmbedFlex.as
index f65f1c48d..eeb4e496d 100644
--- a/libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/TestEmbed.as
+++ b/libsrc/ffdec_lib/testdata/as3_embed/src/tests_classes/TestEmbedFlex.as
@@ -7,7 +7,7 @@ package tests_classes
     import flash.media.Sound;
     import flash.utils.ByteArray;
  
-    public class TestEmbed extends Sprite 
+    public class TestEmbedFlex extends Sprite 
     { 
         [Embed(source="../../assets/image.png")] 
         public var imagePngClass:Class;
@@ -20,8 +20,8 @@ package tests_classes
         public var imageGridPngClass:Class;
                 
         //deprecated in Flex, not supported in AIR
-        //[Embed(source="../../assets/image.svg")]
-        //public var imageSvgClass:Class;
+        [Embed(source="../../assets/image.svg")]
+        public var imageSvgClass:Class;
         
         [Embed(source="../../assets/movie.swf")]
         public var movieSwfClass:Class;
@@ -42,7 +42,7 @@ package tests_classes
         
         
          
-        public function TestEmbed()
+        public function TestEmbedFlex()
         { 
             var someBitmap:Bitmap = new imagePngClass() as Bitmap;
             trace("Dimensions: " + someBitmap.width + "x" + someBitmap.height);
diff --git a/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.air.swf b/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.air.swf
index 5666e44c9..252b4f360 100644
Binary files a/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.air.swf and b/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.air.swf differ
diff --git a/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.flex.swf b/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.flex.swf
index f16bf6797..256528108 100644
Binary files a/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.flex.swf and b/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.flex.swf differ
diff --git a/libsrc/ffdec_lib/testdata/as3_new/src/Main.as b/libsrc/ffdec_lib/testdata/as3_new/src/Main.as
index f4003d93a..804b71688 100644
--- a/libsrc/ffdec_lib/testdata/as3_new/src/Main.as
+++ b/libsrc/ffdec_lib/testdata/as3_new/src/Main.as
@@ -143,8 +143,6 @@ package
         
         TestOtherClass;
         
-        TestEmbed;
-        
         public function Main()
         {
             if (stage) init();