diff --git a/.travis.yml b/.travis.yml
index c683618a..4225d7ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,4 +30,4 @@ script:
  - mkdir $TRAVIS_BUILD_DIR/build
  - cd $TRAVIS_BUILD_DIR/build && $TRAVIS_BUILD_DIR/cmake-3.4.0-Linux-x86_64/bin/cmake -DCMAKE_BUILD_TYPE=Release -DLLVM_DIR=/tmp/LLVM37/share/llvm/cmake -G "Unix Makefiles" -DLLVM_JIT=ON ..
  - cd $TRAVIS_BUILD_DIR/build && make
- - cd $TRAVIS_BUILD_DIR/lua-5.3.1-tests && sh ./run_tests.sh $TRAVIS_BUILD_DIR/build/ravi
+ - cd $TRAVIS_BUILD_DIR/lua-tests && sh ./run_tests.sh $TRAVIS_BUILD_DIR/build/ravi
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16d104d3..d7962e56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,13 +45,13 @@ endif()
 
 if (MSVC)
     set(CMAKE_C_FLAGS_DEBUG "/Od /D_DEBUG /MDd /Zi /RTC1 /EHsc")
-    set(CMAKE_C_FLAGS_RELEASE "/DNDEBUG /Ox /MD /EHsc")
+    set(CMAKE_C_FLAGS_RELEASE "/DNDEBUG /O2 /MD /EHsc")
     set(CMAKE_C_FLAGS_RELWITHDEBINFO "/DNDEBUG /O2 /MD /Zi /EHsc")
     set(CMAKE_C_FLAGS_MINSIZEREL "/DNDEBUG /O2 /MD /EHsc")
 
     set(CMAKE_CXX_FLAGS "/EHsc")
     set(CMAKE_CXX_FLAGS_DEBUG "/Od /D_DEBUG /MDd /Zi /RTC1 /EHsc")
-    set(CMAKE_CXX_FLAGS_RELEASE "/DNDEBUG /Ox /MD /EHsc")
+    set(CMAKE_CXX_FLAGS_RELEASE "/DNDEBUG /O2 /MD /EHsc")
     set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/DNDEBUG /O2 /MD /Zi /EHsc")
     set(CMAKE_CXX_FLAGS_MINSIZEREL "/DNDEBUG /O2 /MD /EHsc")
 
diff --git a/lua-5.3.1-tests/README.rst b/lua-tests/README.rst
similarity index 100%
rename from lua-5.3.1-tests/README.rst
rename to lua-tests/README.rst
diff --git a/lua-5.3.1-tests/all.lua b/lua-tests/all.lua
similarity index 100%
rename from lua-5.3.1-tests/all.lua
rename to lua-tests/all.lua
diff --git a/lua-5.3.1-tests/api.lua b/lua-tests/api.lua
similarity index 100%
rename from lua-5.3.1-tests/api.lua
rename to lua-tests/api.lua
diff --git a/lua-5.3.1-tests/attrib.lua b/lua-tests/attrib.lua
similarity index 100%
rename from lua-5.3.1-tests/attrib.lua
rename to lua-tests/attrib.lua
diff --git a/lua-5.3.1-tests/big.lua b/lua-tests/big.lua
similarity index 100%
rename from lua-5.3.1-tests/big.lua
rename to lua-tests/big.lua
diff --git a/lua-5.3.1-tests/bitwise.lua b/lua-tests/bitwise.lua
similarity index 100%
rename from lua-5.3.1-tests/bitwise.lua
rename to lua-tests/bitwise.lua
diff --git a/lua-5.3.1-tests/calls.lua b/lua-tests/calls.lua
similarity index 100%
rename from lua-5.3.1-tests/calls.lua
rename to lua-tests/calls.lua
diff --git a/lua-5.3.1-tests/closure.lua b/lua-tests/closure.lua
similarity index 100%
rename from lua-5.3.1-tests/closure.lua
rename to lua-tests/closure.lua
diff --git a/lua-5.3.1-tests/code.lua b/lua-tests/code.lua
similarity index 100%
rename from lua-5.3.1-tests/code.lua
rename to lua-tests/code.lua
diff --git a/lua-5.3.1-tests/constructs.lua b/lua-tests/constructs.lua
similarity index 100%
rename from lua-5.3.1-tests/constructs.lua
rename to lua-tests/constructs.lua
diff --git a/lua-5.3.1-tests/coroutine.lua b/lua-tests/coroutine.lua
similarity index 100%
rename from lua-5.3.1-tests/coroutine.lua
rename to lua-tests/coroutine.lua
diff --git a/lua-5.3.1-tests/db.lua b/lua-tests/db.lua
similarity index 100%
rename from lua-5.3.1-tests/db.lua
rename to lua-tests/db.lua
diff --git a/lua-5.3.1-tests/errors.lua b/lua-tests/errors.lua
similarity index 100%
rename from lua-5.3.1-tests/errors.lua
rename to lua-tests/errors.lua
diff --git a/lua-5.3.1-tests/events.lua b/lua-tests/events.lua
similarity index 100%
rename from lua-5.3.1-tests/events.lua
rename to lua-tests/events.lua
diff --git a/lua-5.3.1-tests/files.lua b/lua-tests/files.lua
similarity index 100%
rename from lua-5.3.1-tests/files.lua
rename to lua-tests/files.lua
diff --git a/lua-5.3.1-tests/gc.lua b/lua-tests/gc.lua
similarity index 100%
rename from lua-5.3.1-tests/gc.lua
rename to lua-tests/gc.lua
diff --git a/lua-5.3.1-tests/goto.lua b/lua-tests/goto.lua
similarity index 100%
rename from lua-5.3.1-tests/goto.lua
rename to lua-tests/goto.lua
diff --git a/lua-5.3.1-tests/libs/lib1.c b/lua-tests/libs/lib1.c
similarity index 100%
rename from lua-5.3.1-tests/libs/lib1.c
rename to lua-tests/libs/lib1.c
diff --git a/lua-5.3.1-tests/libs/lib11.c b/lua-tests/libs/lib11.c
similarity index 100%
rename from lua-5.3.1-tests/libs/lib11.c
rename to lua-tests/libs/lib11.c
diff --git a/lua-5.3.1-tests/libs/lib2.c b/lua-tests/libs/lib2.c
similarity index 100%
rename from lua-5.3.1-tests/libs/lib2.c
rename to lua-tests/libs/lib2.c
diff --git a/lua-5.3.1-tests/libs/lib21.c b/lua-tests/libs/lib21.c
similarity index 100%
rename from lua-5.3.1-tests/libs/lib21.c
rename to lua-tests/libs/lib21.c
diff --git a/lua-5.3.1-tests/libs/makefile b/lua-tests/libs/makefile
similarity index 100%
rename from lua-5.3.1-tests/libs/makefile
rename to lua-tests/libs/makefile
diff --git a/lua-5.3.1-tests/literals.lua b/lua-tests/literals.lua
similarity index 100%
rename from lua-5.3.1-tests/literals.lua
rename to lua-tests/literals.lua
diff --git a/lua-5.3.1-tests/locals.lua b/lua-tests/locals.lua
similarity index 100%
rename from lua-5.3.1-tests/locals.lua
rename to lua-tests/locals.lua
diff --git a/lua-5.3.1-tests/ltests/ltests.c b/lua-tests/ltests/ltests.c
similarity index 100%
rename from lua-5.3.1-tests/ltests/ltests.c
rename to lua-tests/ltests/ltests.c
diff --git a/lua-5.3.1-tests/ltests/ltests.h b/lua-tests/ltests/ltests.h
similarity index 100%
rename from lua-5.3.1-tests/ltests/ltests.h
rename to lua-tests/ltests/ltests.h
diff --git a/lua-5.3.1-tests/main.lua b/lua-tests/main.lua
similarity index 100%
rename from lua-5.3.1-tests/main.lua
rename to lua-tests/main.lua
diff --git a/lua-5.3.1-tests/math.lua b/lua-tests/math.lua
similarity index 100%
rename from lua-5.3.1-tests/math.lua
rename to lua-tests/math.lua
diff --git a/lua-5.3.1-tests/nextvar.lua b/lua-tests/nextvar.lua
similarity index 100%
rename from lua-5.3.1-tests/nextvar.lua
rename to lua-tests/nextvar.lua
diff --git a/lua-5.3.1-tests/pm.lua b/lua-tests/pm.lua
similarity index 100%
rename from lua-5.3.1-tests/pm.lua
rename to lua-tests/pm.lua
diff --git a/lua-5.3.1-tests/run_tests.sh b/lua-tests/run_tests.sh
similarity index 100%
rename from lua-5.3.1-tests/run_tests.sh
rename to lua-tests/run_tests.sh
diff --git a/lua-5.3.1-tests/sort.lua b/lua-tests/sort.lua
similarity index 100%
rename from lua-5.3.1-tests/sort.lua
rename to lua-tests/sort.lua
diff --git a/lua-5.3.1-tests/strings.lua b/lua-tests/strings.lua
similarity index 100%
rename from lua-5.3.1-tests/strings.lua
rename to lua-tests/strings.lua
diff --git a/lua-5.3.1-tests/tpack.lua b/lua-tests/tpack.lua
similarity index 100%
rename from lua-5.3.1-tests/tpack.lua
rename to lua-tests/tpack.lua
diff --git a/lua-5.3.1-tests/utf8.lua b/lua-tests/utf8.lua
similarity index 100%
rename from lua-5.3.1-tests/utf8.lua
rename to lua-tests/utf8.lua
diff --git a/lua-5.3.1-tests/vararg.lua b/lua-tests/vararg.lua
similarity index 100%
rename from lua-5.3.1-tests/vararg.lua
rename to lua-tests/vararg.lua
diff --git a/lua-5.3.1-tests/verybig.lua b/lua-tests/verybig.lua
similarity index 100%
rename from lua-5.3.1-tests/verybig.lua
rename to lua-tests/verybig.lua