diff --git a/build/buildmsvc_lua53.bat b/build/buildmsvc_lua53.bat
index c841ce5..5c1d262 100644
--- a/build/buildmsvc_lua53.bat
+++ b/build/buildmsvc_lua53.bat
@@ -18,16 +18,6 @@ cmake --build . --config Release --target INSTALL
 if %errorlevel% neq 0 exit /b %errorlevel%
 cd ..\..
 
-cd ravi-ffi
-rmdir build /s /q
-mkdir build
-cd build
-cmake -DCMAKE_INSTALL_PREFIX=c:/Software/lua53 -DUSE_LUA53=ON -G "Visual Studio 16 2019" ..
-if %errorlevel% neq 0 exit /b %errorlevel%
-cmake --build . --config Release --target INSTALL
-if %errorlevel% neq 0 exit /b %errorlevel%
-cd ..\..
-
 cd ravi-torch-paths
 rmdir build /s /q
 mkdir build
diff --git a/build/buildmsvc_ravi_debug.bat b/build/buildmsvc_ravi_debug.bat
index 894d210..2d0593d 100644
--- a/build/buildmsvc_ravi_debug.bat
+++ b/build/buildmsvc_ravi_debug.bat
@@ -1,13 +1,3 @@
-cd nj
-rmdir build /s /q
-mkdir build
-cd build
-cmake -DCMAKE_INSTALL_PREFIX=c:/Software/ravi -G "Visual Studio 16 2019" ..
-if %errorlevel% neq 0 exit /b %errorlevel%
-cmake --build . --config Debug --target INSTALL
-if %errorlevel% neq 0 exit /b %errorlevel%
-cd ..\..
-
 cd ravi-external-libs
 rmdir build /s /q
 mkdir build
@@ -24,7 +14,7 @@ cd ravi
 rmdir build /s /q
 mkdir build
 cd build
-cmake -DOMR_JIT=ON -DCMAKE_INSTALL_PREFIX=c:/Software/ravi -G "Visual Studio 16 2019" ..
+cmake -DCMAKE_INSTALL_PREFIX=c:/Software/ravi -G "Visual Studio 16 2019" ..
 if %errorlevel% neq 0 exit /b %errorlevel%
 cmake --build . --config Debug --target INSTALL
 if %errorlevel% neq 0 exit /b %errorlevel%
diff --git a/build/osx_build.sh b/build/osx_build.sh
index da7287a..e5b4ddd 100644
--- a/build/osx_build.sh
+++ b/build/osx_build.sh
@@ -7,7 +7,7 @@ export LUA_CPATH="$LUA_CPATH;$RAVI_HOME/lib/?.so;$RAVI_HOME/lib/lib?.so"
 # Note following assumes brew install openssl
 export OPENSSL_ROOT_DIR=/usr/local/opt/openssl
 
-for dir in nj ravi-external-libs ravi ravi-cjson ravi-filesystem ravi-lpeglabel ravi-luasocket ravi-moses ravi-penlight ravi-torch-paths ravi-torch7-sys ravi-torch7 ravi-torch7-xlua ravi-torch7-nn ravi-torch7-optim ravi-torch7-autograd ravi-torch-cephes ravi-libuv-luv ravi-protobuf ravi-luaossl; do
+for dir in ravi-external-libs ravi ravi-cjson ravi-filesystem ravi-lpeglabel ravi-luasocket ravi-moses ravi-penlight ravi-torch-paths ravi-torch7-sys ravi-torch7 ravi-torch7-xlua ravi-torch7-nn ravi-torch7-optim ravi-torch7-autograd ravi-torch-cephes ravi-libuv-luv ravi-protobuf ravi-luaossl; do
 	echo "Building $dir"
-	cd $dir && rm -rf build && mkdir build && cd build && cmake -DOMR_JIT=ON -DCMAKE_INSTALL_PREFIX=$RAVI_HOME .. && make install && cd ../..
+	cd $dir && rm -rf build && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=$RAVI_HOME .. && make install && cd ../..
 done
diff --git a/run_tests.bat b/run_tests.bat
index f8e27b0..8d50fd1 100644
--- a/run_tests.bat
+++ b/run_tests.bat
@@ -3,6 +3,10 @@ set PATH=%RAVI_HOME%\bin;%PATH%
 set LUA_PATH=%RAVI_HOME%\share\lua\5.3\?.lua;%RAVI_HOME%\share\lua\5.3\?\init.lua;.\?.lua;.\?\init.lua
 set LUA_CPATH=%RAVI_HOME%\bin\?.dll
 
+cd ravi-cjson\tests
+ravi test.lua
+cd ..\..
+
 cd ravi\ravi-tests
 ravi ravi_tests1.ravi
 cd ..\..
@@ -34,3 +38,58 @@ cd ..
 cd ravi-torch7-autograd\test
 ravi test.lua
 cd ..\..
+
+cd ravi-lpeglabel
+ravi test.lua
+ravi testlabel.lua
+cd ..
+
+cd ravi-penlight\tests
+ravi test-animal.lua
+ravi test-args.lua
+ravi test-array.lua
+ravi test-class.lua
+ravi test-compare-no-order.lua
+ravi test-compat.lua
+ravi test-comprehension.lua
+ravi test-config.lua
+ravi test-data.lua
+ravi test-date.lua
+ravi test-dir.lua
+ravi test-executeex.lua
+ravi test-fenv.lua
+ravi test-func.lua
+ravi test-import_into.lua
+ravi test-job-query.lua
+ravi test-klass.lua
+ravi test-lapp.lua
+ravi test-lexer.lua
+ravi test-list.lua
+ravi test-map.lua
+ravi test-move.lua
+ravi test-path.lua
+ravi test-pretty-number.lua
+ravi test-pretty.lua
+ravi test-pylib.lua
+ravi test-relpath.lua
+ravi test-seq.lua
+ravi test-set.lua
+ravi test-sip.lua
+ravi test-strict.lua
+ravi test-stringio.lua
+ravi test-stringx.lua
+ravi test-super.lua
+ravi test-tablex.lua
+ravi test-template.lua
+ravi test-text.lua
+ravi test-types.lua
+ravi test-tzone.lua
+ravi test-url.lua
+ravi test-utils.lua
+ravi test-vector.lua
+ravi test-xml.lua
+cd ../..
+
+cd ravi-libuv-luv
+ravi tests\run.lua
+cd ..
\ No newline at end of file
diff --git a/run_tests.sh b/run_tests.sh
index 2fa274f..bcdea59 100644
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -1,11 +1,93 @@
 # set -x
-source ~/ravi/bin/ravienv.sh
-
-cd ravi/ravi-tests && ravi ravi_tests1.ravi && cd -
-cd ravi/lua-tests && ravi -e"_port=1" all.lua && cd -
-cd ravi-torch7/test && ravi -ltorch -e "t=torch.test(); if t.errors[1] then os.exit(1) end" && cd -
-cd ravi-torch7/test && ravi -ltorch test_qr.lua && cd -
-cd ravi-torch7/test && ravi -ltorch test_aliasMultinomial.lua && cd -
-cd ravi-torch7/test && ravi -ltorch test_half.lua && cd -
-cd ravi-torch7-nn && ravi -ltorch -lnn -e "nn.test()" && cd -
-cd ravi-torch7-autograd/test && ravi test.lua && cd -
\ No newline at end of file
+. ~/ravi/bin/ravienv.sh
+
+cd ravi-cjson/tests 
+ravi test.lua 
+cd -
+
+cd ravi/ravi-tests
+ravi ravi_tests1.ravi
+cd -
+
+cd ravi/lua-tests
+ravi -e"_port=1" all.lua
+cd -
+
+cd ravi-torch7/test
+ravi -ltorch -e "t=torch.test(); if t.errors[1] then os.exit(1) end"
+cd -
+
+cd ravi-torch7/test
+ravi -ltorch test_qr.lua
+cd -
+
+cd ravi-torch7/test
+ravi -ltorch test_aliasMultinomial.lua
+cd -
+
+cd ravi-torch7/test
+ravi -ltorch test_half.lua
+cd -
+
+cd ravi-torch7-nn
+ravi -ltorch -lnn -e "nn.test()"
+cd -
+
+cd ravi-torch7-autograd/test
+ravi test.lua
+cd -
+
+cd ravi-lpeglabel
+ravi test.lua
+ravi testlabel.lua
+cd -
+
+cd ravi-penlight/tests
+ravi test-animal.lua
+ravi test-args.lua
+ravi test-array.lua
+ravi test-class.lua
+ravi test-compare-no-order.lua
+ravi test-compat.lua
+ravi test-comprehension.lua
+ravi test-config.lua
+ravi test-data.lua
+ravi test-date.lua
+ravi test-dir.lua
+ravi test-executeex.lua
+ravi test-fenv.lua
+ravi test-func.lua
+ravi test-import_into.lua
+ravi test-job-query.lua
+ravi test-klass.lua
+ravi test-lapp.lua
+ravi test-lexer.lua
+ravi test-list.lua
+ravi test-map.lua
+ravi test-move.lua
+ravi test-path.lua
+ravi test-pretty-number.lua
+ravi test-pretty.lua
+ravi test-pylib.lua
+ravi test-relpath.lua
+ravi test-seq.lua
+ravi test-set.lua
+ravi test-sip.lua
+ravi test-strict.lua
+ravi test-stringio.lua
+ravi test-stringx.lua
+ravi test-super.lua
+ravi test-tablex.lua
+ravi test-template.lua
+ravi test-text.lua
+ravi test-types.lua
+ravi test-tzone.lua
+ravi test-url.lua
+ravi test-utils.lua
+ravi test-vector.lua
+ravi test-xml.lua
+cd -
+
+cd ravi-libuv-luv
+ravi tests/run.lua
+cd -
\ No newline at end of file
diff --git a/run_tests_lua53.bat b/run_tests_lua53.bat
new file mode 100644
index 0000000..c5942ae
--- /dev/null
+++ b/run_tests_lua53.bat
@@ -0,0 +1,87 @@
+set RAVI_HOME=c:\Software\lua53
+set PATH=%RAVI_HOME%\bin;%PATH%
+set LUA_PATH=%RAVI_HOME%\share\lua\5.3\?.lua;%RAVI_HOME%\share\lua\5.3\?\init.lua;.\?.lua;.\?\init.lua
+set LUA_CPATH=%RAVI_HOME%\bin\?.dll
+
+cd ravi-cjson\tests
+lua test.lua
+cd ..\..
+
+cd ravi-torch7\test
+lua -ltorch -e "t=torch.test(); if t.errors[1] then os.exit(1) end" 
+cd ..\..
+
+cd ravi-torch7\test
+lua -ltorch test_qr.lua 
+cd ..\..
+
+cd ravi-torch7\test
+lua -ltorch test_aliasMultinomial.lua
+cd ..\..
+
+cd ravi-torch7\test
+lua -ltorch test_half.lua
+cd ..\..
+
+cd ravi-torch7-nn
+lua -ltorch -lnn -e "nn.test()"
+cd ..
+
+cd ravi-torch7-autograd\test
+lua test.lua
+cd ..\..
+
+cd ravi-lpeglabel
+lua test.lua
+lua testlabel.lua
+cd ..
+
+cd ravi-penlight\tests
+lua test-animal.lua
+lua test-args.lua
+lua test-array.lua
+lua test-class.lua
+lua test-compare-no-order.lua
+lua test-compat.lua
+lua test-comprehension.lua
+lua test-config.lua
+lua test-data.lua
+lua test-date.lua
+lua test-dir.lua
+lua test-executeex.lua
+lua test-fenv.lua
+lua test-func.lua
+lua test-import_into.lua
+lua test-job-query.lua
+lua test-klass.lua
+lua test-lapp.lua
+lua test-lexer.lua
+lua test-list.lua
+lua test-map.lua
+lua test-move.lua
+lua test-path.lua
+lua test-pretty-number.lua
+lua test-pretty.lua
+lua test-pylib.lua
+lua test-relpath.lua
+lua test-seq.lua
+lua test-set.lua
+lua test-sip.lua
+lua test-strict.lua
+lua test-stringio.lua
+lua test-stringx.lua
+lua test-super.lua
+lua test-tablex.lua
+lua test-template.lua
+lua test-text.lua
+lua test-types.lua
+lua test-tzone.lua
+lua test-url.lua
+lua test-utils.lua
+lua test-vector.lua
+lua test-xml.lua
+cd ../..
+
+cd ravi-libuv-luv
+lua tests\run.lua
+cd ..
\ No newline at end of file