diff --git a/installer/amxmodx-installer.nsi b/installer/amxmodx-installer.nsi
index 4de57256..df9d9926 100755
--- a/installer/amxmodx-installer.nsi
+++ b/installer/amxmodx-installer.nsi
@@ -304,6 +304,8 @@ Section "MainSection" SEC01
   File "installer\files\base\addons\amxmodx\scripting\amxmod_compat\mysql.sma"
   File "installer\files\base\addons\amxmodx\scripting\amxmod_compat\vexdum.sma"
   SetOutPath "$INSTDIR\files\base\scripting\testsuite"
+  File "installer\files\base\addons\amxmodx\scripting\testsuite\admins_test.sma"
+  File "installer\files\base\addons\amxmodx\scripting\testsuite\arraytest.sma"
   File "installer\files\base\addons\amxmodx\scripting\testsuite\callfunc_test.sma"
   File "installer\files\base\addons\amxmodx\scripting\testsuite\fakemeta_tests.sma"
   File "installer\files\base\addons\amxmodx\scripting\testsuite\fmttest.sma"
@@ -311,11 +313,13 @@ Section "MainSection" SEC01
   File "installer\files\base\addons\amxmodx\scripting\testsuite\fwdtest2.sma"
   File "installer\files\base\addons\amxmodx\scripting\testsuite\logtest.sma"
   File "installer\files\base\addons\amxmodx\scripting\testsuite\menutest.sma"
+  File "installer\files\base\addons\amxmodx\scripting\testsuite\nativetest.sma"
   File "installer\files\base\addons\amxmodx\scripting\testsuite\nvault_test.sma"
   File "installer\files\base\addons\amxmodx\scripting\testsuite\sorttest.sma"
   File "installer\files\base\addons\amxmodx\scripting\testsuite\sqlxtest.sma"
   File "installer\files\base\addons\amxmodx\scripting\testsuite\sqlxtest.sq3"
   File "installer\files\base\addons\amxmodx\scripting\testsuite\sqlxtest.sql"
+  File "installer\files\base\addons\amxmodx\scripting\testsuite\trietest.sma"
   SetOutPath "$INSTDIR\files\cstrike\configs"
   File "installer\files\cstrike\addons\amxmodx\configs\amxx.cfg"
   File "installer\files\cstrike\addons\amxmodx\configs\cmds.ini"
@@ -597,27 +601,31 @@ Section Uninstall
   Delete "$INSTDIR\files\cstrike\configs\core.ini"
   Delete "$INSTDIR\files\cstrike\configs\cmds.ini"
   Delete "$INSTDIR\files\cstrike\configs\amxx.cfg"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\timeleft.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\telemenu.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\statscfg.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\scrollmsg.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\pluginmenu.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\plmenu.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\pausecfg.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\nextmap.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\multilingual.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\menufront.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\mapsmenu.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\mapchooser.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod_compat\amxmod.inc"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod_compat\maths.inc"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod_compat\mysql.inc"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod_compat\translator.inc"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod_compat\Vexd_Utilities.inc"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod_compat\VexdUM.inc"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod_compat\VexdUM_const.inc"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod_compat\VexdUM_stock.inc"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\trietest.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\sqlxtest.sql"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\sqlxtest.sq3"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\sqlxtest.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\sorttest.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\nvault_test.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\nativetest.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\menutest.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\logtest.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\fwdtest2.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\fwdtest1.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\fmttest.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\fakemeta_tests.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\callfunc_test.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\arraytest.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\admins_test.sma"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod_compat\xtrafun.inc"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod_compat\VexdUM_stock.inc"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod_compat\VexdUM_const.inc"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod_compat\VexdUM.inc"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod_compat\Vexd_Utilities.inc"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod_compat\translator.inc"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod_compat\mysql.inc"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod_compat\maths.inc"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod_compat\amxmod.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\xtrafun.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\xs.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\Vexd_Utilities.inc"
@@ -677,6 +685,22 @@ Section Uninstall
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmisc.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxconst.inc"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\amxmod_compat\amxmod_compat.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\amxmod_compat\core.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\amxmod_compat\mysql.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\amxmod_compat\vexdum.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\timeleft.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\telemenu.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\statscfg.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\scrollmsg.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\pluginmenu.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\plmenu.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\pausecfg.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\nextmap.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\multilingual.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\menufront.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\mapsmenu.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\mapchooser.sma"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\imessage.sma"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\dlsym64"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\dlsym"
@@ -696,22 +720,6 @@ Section Uninstall
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\admincmd.sma"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\adminchat.sma"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\admin.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\amxmod_compat\amxmod_compat.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\amxmod_compat\core.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\amxmod_compat\mysql.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\amxmod_compat\vexdum.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\callfunc_test.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\fakemeta_tests.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\fmttest.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\fwdtest1.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\fwdtest2.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\logtest.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\menutest.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\nvault_test.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\sorttest.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\sqlxtest.sma"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\sqlxtest.sq3"
-  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\testsuite\sqlxtest.sql"
   Delete "$INSTDIR\files\base\plugins\timeleft.amxx"
   Delete "$INSTDIR\files\base\plugins\telemenu.amxx"
   Delete "$INSTDIR\files\base\plugins\statscfg.amxx"