diff --git a/Zframework/init.lua b/Zframework/init.lua
index bf1594cc..b8d4fece 100644
--- a/Zframework/init.lua
+++ b/Zframework/init.lua
@@ -9,7 +9,8 @@ TABLE=      require'Zframework.tableExtend'
 STRING=     require'Zframework.stringExtend'
 PROFILE=    require'Zframework.profile'
 JSON=       require'Zframework.json'
-TESTING=    require'Zframework.testing'
+TEST=       require'Zframework.test'
+
 do--Add pcall & MES for JSON lib
     local encode,decode=JSON.encode,JSON.decode
     JSON.encode=function(val)
diff --git a/Zframework/testing.lua b/Zframework/test.lua
similarity index 53%
rename from Zframework/testing.lua
rename to Zframework/test.lua
index b7dd6a38..6cbb0c8d 100644
--- a/Zframework/testing.lua
+++ b/Zframework/test.lua
@@ -1,13 +1,12 @@
---Utils for testing
-local testing={}
+local TEST={}
 
 --Wait for the scene swapping animation to finish
-function testing.switchSCN()
+function TEST.switchSCN()
     while SCN.swapping do YIELD()end
 end
 
-function testing.sleep(frames)
+function TEST.wait(frames)
     for _=1,frames do YIELD()end
 end
 
-return testing
+return TEST
diff --git a/main.lua b/main.lua
index ff4cbcff..29c3913e 100644
--- a/main.lua
+++ b/main.lua
@@ -590,25 +590,24 @@ for i=1,#_LOADTIMELIST_ do LOG(_LOADTIMELIST_[i])end
 
 if TABLE.find(arg,'--test')then
     TASK.new(function()
-        local switchSCN,sleep=TESTING.switchSCN,TESTING.sleep
         while not LOADED do YIELD()end
 
-        print("\27[92m\27[1mAutomatic Test Started\27[0m")
+        LOG("\27[92m\27[1mAutomatic Test Started\27[0m")
         BGM.setVol(0)SFX.setVol(0)
         love.keypressed('space')
-        switchSCN()
+        TEST.switchSCN()
 
         for k,mode in next,MODES do
             if k~='netBattle'then
-                print("Scanning mode: "..mode.name)
+                LOG("Scanning mode: "..mode.name)
                 loadGame(mode.name,true)
-                switchSCN()
+                TEST.switchSCN()
                 SCN.back()
-                switchSCN()
+                TEST.switchSCN()
             end
         end
-        print("\27[92m\27[1mAutomatic Test Passed :)\27[0m")
-        sleep(60)
+        LOG("\27[92m\27[1mAutomatic Test Passed :)\27[0m")
+        TEST.wait(60)
         love.event.quit(0)
     end)
     TASK.new(function()
@@ -616,8 +615,8 @@ if TABLE.find(arg,'--test')then
             YIELD()
             if ERRDATA[1]then break end
         end
-        print("\27[91m\27[1mAutomatic Test Failed :(\27[0m\nThe error message is:\n"..table.concat(ERRDATA[1].mes,"\n").."\27[91m\nAborting\27[0m")
-        TESTING.sleep(60)
+        LOG("\27[91m\27[1mAutomatic Test Failed :(\27[0m\nThe error message is:\n"..table.concat(ERRDATA[1].mes,"\n").."\27[91m\nAborting\27[0m")
+        TEST.wait(60)
         love.event.quit(1)
     end)
 end