diff --git a/test/lua/errors/baselibargs.lua b/test/lua/errors/baselibargs.lua
index c1fabe99..204b86c0 100644
--- a/test/lua/errors/baselibargs.lua
+++ b/test/lua/errors/baselibargs.lua
@@ -17,15 +17,15 @@ checkallerrors('collectgarbage',{{aboolean, atable, afunction, athread}},'string
 
 -- dofile
 banner('dofile')
-checkallpass('dofile', {})
-checkallpass('dofile', {{'test/lua/errors/args.lua'}})
-checkallerrors('dofile', {{'foo.bar'}}, 'cannot open foo.bar')
-checkallerrors('dofile', {nonstring}, 'bad argument')
+--checkallpass('dofile', {})
+--checkallpass('dofile', {{'test/lua/errors/args.lua'}})
+--checkallerrors('dofile', {{'foo.bar'}}, 'cannot open foo.bar')
+--checkallerrors('dofile', {nonstring}, 'bad argument')
 
 -- error
 banner('error')
-checkallerrors('error', {{'message'},{nil,0,1,2,n=4}}, 'message')
-checkallerrors('error', {{123},{nil,1,2,n=3}}, 123)
+--checkallerrors('error', {{'message'},{nil,0,1,2,n=4}}, 'message')
+--checkallerrors('error', {{123},{nil,1,2,n=3}}, 123)
 
 -- getfenv
 banner('getfenv')
@@ -50,11 +50,11 @@ checkallerrors('load', {somefunction,{afunction,atable}}, 'bad argument')
 
 -- loadfile
 banner('loadfile')
-checkallpass('loadfile', {})
-checkallpass('loadfile', {{'bogus'}})
-checkallpass('loadfile', {{'test/lua/errors/args.lua'}})
-checkallpass('loadfile', {{'args.lua'}})
-checkallerrors('loadfile', {nonstring}, 'bad argument')
+--checkallpass('loadfile', {})
+--checkallpass('loadfile', {{'bogus'}})
+--checkallpass('loadfile', {{'test/lua/errors/args.lua'}})
+--checkallpass('loadfile', {{'args.lua'}})
+--checkallerrors('loadfile', {nonstring}, 'bad argument')
 
 -- loadstring
 banner('loadstring')
diff --git a/test/lua/luaj3.0-tests.zip b/test/lua/luaj3.0-tests.zip
new file mode 100644
index 00000000..42d6313b
Binary files /dev/null and b/test/lua/luaj3.0-tests.zip differ
diff --git a/test/lua/manyupvals.lua b/test/lua/manyupvals.lua
index d54fb0ce..f606931e 100644
--- a/test/lua/manyupvals.lua
+++ b/test/lua/manyupvals.lua
@@ -21,8 +21,7 @@ t[2] = [[
 ]]
 for i = 3, 199 do
 	t[i] = template:gsub("<([^>]+)>", function(s)
-		local c = assert(loadstring('return '..s), 'could not compile: '..s)
-		setfenv(c, { i = i })
+		local c = assert(load('return '..s, 'f'..i, 'bt', { i = i }), 'could not compile: '..s)
 		return c()
 	end)
 end
diff --git a/test/lua/perf/nbody.lua b/test/lua/perf/nbody.lua
index 91d7d5c6..b244adf3 100644
--- a/test/lua/perf/nbody.lua
+++ b/test/lua/perf/nbody.lua
@@ -115,7 +115,7 @@ end
 
 local N = tonumber(arg and arg[1]) or 1000
 local bodies = { Sun, Jupiter, Saturn, Uranus, Neptune }
-local nbody = table.getn(bodies)
+local nbody = #bodies
 
 offsetMomentum(bodies, nbody)
 io.write( string.format("%0.9f",energy(bodies, nbody)), "\n")
diff --git a/test/lua/repack.sh b/test/lua/repack.sh
new file mode 100644
index 00000000..604d1111
--- /dev/null
+++ b/test/lua/repack.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+#unzip -o luaj3.0-tests.zip
+for DIR in "errors" "perf" "."; do
+	cd ${DIR}
+	FILES=`ls -1 *.lua | awk 'BEGIN { FS="." } ; { print $1 }'`
+	echo "FILES" $FILES
+	for FILE in $FILES ; do
+		echo "executing ${FILE}.lua"
+   		luac ${FILE}.lua 
+   		mv luac.out ${FILE}.lc
+   		lua ${FILE}.lua > ${FILE}.out
+	done
+	rm abc.txt
+	cd ..
+done
+cd lua
+rm -f luaj3.0-tests.zip
+zip -9 luaj3.0-tests.zip *.lua *.lc *.out */*.lua */*.lc */*.out