Merge master to resolve conflict in tests not present yet

diff --cc tests/tests.sh
index 776be84,6cfb9be..24c99e4
--- 1/tests/tests.sh
--- 2/tests/tests.sh
+++ b/tests/tests.sh
@@@ -19,8 -19,8 +19,9 @@@
  
  # Set lang do default to avoid failed tests because of locale
  export LANG=C
+ export LC_ALL=C
  export NIT_TESTING=true
 +export MNIT_SRAND=0
  
  unset NIT_DIR
  
@@@ -436,12 -411,15 +412,17 @@@ for ii in "$@"; d
  
                if [ -f "$f.inputs" ]; then
                        inputs="$f.inputs"
 +                      export MNIT_READ_INPUT="$f.inputs"
                else
                        inputs=/dev/null
 +                      export MNIT_READ_INPUT=/dev/null
                fi
  
+               ffout="$ff.bin"
+               if [ "$engine" = "emscripten" ]; then
+                       ffout="$ff.bin.js"
+               fi
+ 
                if [ "$engine" = "niti" ]; then
                        cat > "./$ff.bin" <<END
  exec $NITC --no-color $OPT "$i" $includes -- "\$@"