diff --git a/validator/acts_validator/Test.json b/validator/acts_validator/Test.json
index b25a26209a989fe462de165c536b532a6ab77cf2..ff43da74da498086ed0404b6363f00fab24abdb8 100644
--- a/validator/acts_validator/Test.json
+++ b/validator/acts_validator/Test.json
@@ -1,9 +1,10 @@
 {
     "description": "Configuration for hjunit demo Tests",
     "driver": {
-        "type": "OHJSUnitTest",
+        "type": "ValidatorTest",
         "bundle-name": "com.example.actsvalidator",
-        "package-name": "com.example.actsvalidator"
+        "package-name": "com.example.actsvalidator",
+        "xml_path": "/data/app/el2/100/base/com.example.actsvalidator/haps/entry/files/Test.xml"
     },
     "kits": [
         {
@@ -11,7 +12,7 @@
                 "validator.hap"
             ],
             "type": "AppInstallKit",
-            "cleanup-apps": true
+            "cleanup-apps": false
         },
         {
             "type": "ShellKit",
@@ -20,7 +21,7 @@
             ]
         },
         {
-            "type":"CommandKit",
+            "type": "CommandKit",
             "shell": [
                 {
                     "name": "shell",
@@ -37,87 +38,38 @@
                 {
                     "name": "push",
                     "value": "picture->/storage/media/100/local/files/Pictures"
-                },
-                {
-                    "name": "push",
-                    "value": "AAC160001.aac->/storage/media/100/local/files/Audios/ValidatorData"
-                },
-                {
-                    "name": "push",
-                    "value": "AAC48000321.aac->/storage/media/100/local/files/Audios/ValidatorData"
-                },
-                {
-                    "name": "push",
-                    "value": "FLAC48000321.flac->/storage/media/100/local/files/Audios/ValidatorData"
-                },
-                {
-                    "name": "push",
-                    "value": "MP348000321.mp3->/storage/media/100/local/files/Audios/ValidatorData"
-                },
-                {
-                    "name": "push",
-                    "value": "MPEG448000321.m4a->/storage/media/100/local/files/Audios/ValidatorData"
-                },
-                {
-                    "name": "push",
-                    "value": "OGG480001.ogg->/storage/media/100/local/files/Audios/ValidatorData"
-                },
-                {
-                    "name": "push",
-                    "value": "vorbis48000321.wav->/storage/media/100/local/files/Audios/ValidatorData"
-                },
-                {
-                    "name": "push",
-                    "value": "h263Mp3.mkv->/storage/media/100/local/files/Videos/ValidatorData"
-                },
-                {
-                    "name": "push",
-                    "value": "h263Mp3.mp4->/storage/media/100/local/files/Videos/ValidatorData"
-                },
-                {
-                    "name": "push",
-                    "value": "h263Mp3.ts->/storage/media/100/local/files/Videos/ValidatorData"
-                },
-                {
-                    "name": "push",
-                    "value": "h264Mp3.mkv->/storage/media/100/local/files/Videos/ValidatorData"
-                },
-                {
-                    "name": "push",
-                    "value": "h264Mp3.mp4->/storage/media/100/local/files/Videos/ValidatorData"
-                },
-                {
-                    "name": "push",
-                    "value": "mpeg2AAC.mp4->/storage/media/100/local/files/Videos/ValidatorData"
-                },
-                {
-                    "name": "push",
-                    "value": "mpeg2AAC.ts->/storage/media/100/local/files/Videos/ValidatorData"
-                },
-                {
-                    "name": "push",
-                    "value": "mpeg2Mp3.mkv->/storage/media/100/local/files/Videos/ValidatorData"
-                },
-                {
-                    "name": "push",
-                    "value": "mpeg4AAC.mkv->/storage/media/100/local/files/Videos/ValidatorData"
-                },
-                {
-                    "name": "push",
-                    "value": "mpeg4AAC.ts->/storage/media/100/local/files/Videos/ValidatorData"
-                },
-                {
-                    "name": "push",
-                    "value": "VP8VORBIS.webm->/storage/media/100/local/files/Videos/ValidatorData"
-                },
-                {
-                    "name": "install",
-                    "value": "validator.hap"
-                },
-                {
-                    "name": "shell",
-                    "value": "scanner"
                 }
+                
+            ]
+        },
+        {
+            "type": "PushKit",
+            "push": [
+                "AAC160001.aac->/storage/media/100/local/files/Audios/ValidatorData/AAC160001.aac",
+                "AAC48000321.aac->/storage/media/100/local/files/Audios/ValidatorData/AAC48000321.aac",
+                "FLAC48000321.flac->/storage/media/100/local/files/Audios/ValidatorData/FLAC48000321.flac",
+                "MP348000321.mp3->/storage/media/100/local/files/Audios/ValidatorData/MP348000321.mp3",
+                "MPEG448000321.m4a->/storage/media/100/local/files/Audios/ValidatorData/MPEG448000321.m4a",
+                "OGG480001.ogg->/storage/media/100/local/files/Audios/ValidatorData/OGG480001.ogg",
+                "vorbis48000321.wav->/storage/media/100/local/files/Audios/ValidatorData/vorbis48000321.wav",
+                "h263Mp3.mkv->/storage/media/100/local/files/Videos/ValidatorData/h263Mp3.mkv",
+                "h263Mp3.mp4->/storage/media/100/local/files/Videos/ValidatorData/h263Mp3.mp4",
+                "h263Mp3.ts->/storage/media/100/local/files/Videos/ValidatorData/h263Mp3.ts",
+                "h264Mp3.mkv->/storage/media/100/local/files/Videos/ValidatorData/h264Mp3.mkv",
+                "h264Mp3.mp4->/storage/media/100/local/files/Videos/ValidatorData/h264Mp3.mp4",
+                "mpeg2AAC.mp4->/storage/media/100/local/files/Videos/ValidatorData/mpeg2AAC.mp4",
+                "mpeg2AAC.ts->/storage/media/100/local/files/Videos/ValidatorData/mpeg2AAC.ts",
+                "mpeg2Mp3.mkv->/storage/media/100/local/files/Videos/ValidatorData/mpeg2Mp3.mkv",
+                "mpeg4AAC.mkv->/storage/media/100/local/files/Videos/ValidatorData/mpeg4AAC.mkv",
+                "mpeg4AAC.ts->/storage/media/100/local/files/Videos/ValidatorData/mpeg4AAC.ts",
+                "VP8VORBIS.webm->/storage/media/100/local/files/Videos/ValidatorData/VP8VORBIS.webm"
+            ],
+            "uninstall": false
+        },
+        {
+            "type": "ShellKit",
+            "run-command": [
+                "scanner"
             ]
         }
     ]