diff --git a/test.bat b/test.bat
index 6ceb289..0396c75 100644
--- a/test.bat
+++ b/test.bat
@@ -11,99 +11,95 @@ call metacall pip
 
 echo NodeJS tests
 set "LOADER_SCRIPT_PATH=%loc%\node"
+
 echo Npm Test
-start /wait metacall.bat npm install is-number ^> out.txt
-type out.txt
+call metacall npm install is-number ^> out.txt
 if %errorlevel%==1 goto :test_fail
 echo Successfull!!
+
 echo Node metacall test
 type "%loc%\node\commands.txt" | metacall.bat ^> out.txt
 if %errorlevel%==1 goto :test_fail
 type out.txt | findstr "366667" || goto :test_fail 
-type out.txt
 echo Successfull!!
 
 echo Python tests
 set "LOADER_SCRIPT_PATH=%loc%\python"
-@ 
-setlocal
 set "PYTHONHOME=%~dp0metacall\runtimes\python"
 set "PIP_TARGET=%~dp0metacall\runtimes\python\Lib\site-packages"
 set "PATH=%~dp0metacall\runtimes\python;%~dp0metacall\runtimes\python\Scripts;%~dp0metacall\runtimes\python\Lib\site-packages\bin"
-endlocal
-@
+
 echo Pip Test
-start /wait metacall.bat pip install PyYAML ^> out.txt
-type out.txt
+call metacall pip install PyYAML ^> out.txt
 if %errorlevel%==1 goto :test_fail
 echo Successfull!!
+
 echo Python metacall test
 type "%loc%\python\commands.txt" | metacall.bat ^> out.txt 
 if %errorlevel%==1 goto :test_fail
 type out.txt | findstr "Hello World" || goto :test_fail
-type out.txt
 echo Successfull!!
 
 echo Ruby tests
 set "LOADER_SCRIPT_PATH=%loc%\ruby"
+
 echo Gem test
-start /wait metacall.bat gem install metacall ^> out.txt
-type out.txt
+call metacall gem install metacall ^> out.txt
 if %errorlevel%==1 goto :test_fail
 echo Successfull!!
+
 echo bundle test
-start /wait metacall.bat bundle --version ^> out.txt
-type out.txt
+call metacall bundle --version ^> out.txt
 if %errorlevel%==1 goto :test_fail
 echo Successfull!!
+
 echo bundler test
-start /wait metacall.bat bundler --version ^> out.txt
-type out.txt
+call metacall bundler --version ^> out.txt
 if %errorlevel%==1 goto :test_fail
 echo Successfull!!
+
 echo erb test
-start /wait metacall.bat erb --version ^> out.txt
-type out.txt
+call metacall erb --version ^> out.txt
 if %errorlevel%==1 goto :test_fail
 echo Successfull!!
+
 echo irb test
-start /wait metacall.bat irb --version ^> out.txt
-type out.txt
+call metacall irb --version ^> out.txt
 if %errorlevel%==1 goto :test_fail
 echo Successfull!!
+
 echo racc test
-start /wait metacall.bat racc --version ^> out.txt
-type out.txt
+call metacall racc --version ^> out.txt
 if %errorlevel%==1 goto :test_fail
 echo Successfull!!
+
 echo rake test
-start /wait metacall.bat rake --version ^> out.txt
-type out.txt
+call metacall rake --version ^> out.txt
 if %errorlevel%==1 goto :test_fail
 echo Successfull!!
+
 echo rbs test
-start /wait metacall.bat rbs --version ^> out.txt
-type out.txt
+call metacall rbs --version ^> out.txt
 if %errorlevel%==1 goto :test_fail
 echo Successfull!!
+
 echo rdbg test
-start /wait metacall.bat rdbg --version ^> out.txt
-type out.txt
+call metacall rdbg --version ^> out.txt
 if %errorlevel%==1 goto :test_fail
 echo Successfull!!
+
 echo rdoc test
-start /wait metacall.bat rdoc --version ^> out.txt
-type out.txt
+call metacall rdoc --version ^> out.txt
 if %errorlevel%==1 goto :test_fail
 echo Successfull!!
+
 echo ri test
-start /wait metacall.bat ri --version ^> out.txt
-type out.txt
+call metacall ri --version ^> out.txt
 if %errorlevel%==1 goto :test_fail
 echo Successfull!!
+
 echo typeprof test
-start /wait metacall.bat typeprof --version ^> out.txt
-type out.txt
+call metacall typeprof --version ^> out.txt
 if %errorlevel%==1 goto :test_fail
 echo Successfull!!