diff --git a/jscomp/test/.depend b/jscomp/test/.depend
index a031d857a5..b7979b10f6 100644
--- a/jscomp/test/.depend
+++ b/jscomp/test/.depend
@@ -50,8 +50,8 @@ buffer_test.cmo : ../stdlib/string.cmi mt.cmo ../stdlib/bytes.cmi \
     ../stdlib/buffer.cmi
 buffer_test.cmx : ../stdlib/string.cmx mt.cmx ../stdlib/bytes.cmx \
     ../stdlib/buffer.cmx
-complex_if.cmo :
-complex_if.cmx :
+complex_if_test.cmo : mt.cmo ../stdlib/bytes.cmi
+complex_if_test.cmx : mt.cmx ../stdlib/bytes.cmx
 complex_test.cmo : mt.cmo ../stdlib/complex.cmi
 complex_test.cmx : mt.cmx ../stdlib/complex.cmx
 complex_while_loop.cmo :
@@ -408,8 +408,8 @@ buffer_test.cmo : ../stdlib/string.cmi mt.cmo ../stdlib/bytes.cmi \
     ../stdlib/buffer.cmi
 buffer_test.cmj : ../stdlib/string.cmj mt.cmj ../stdlib/bytes.cmj \
     ../stdlib/buffer.cmj
-complex_if.cmo :
-complex_if.cmj :
+complex_if_test.cmo : mt.cmo ../stdlib/bytes.cmi
+complex_if_test.cmj : mt.cmj ../stdlib/bytes.cmj
 complex_test.cmo : mt.cmo ../stdlib/complex.cmi
 complex_test.cmj : mt.cmj ../stdlib/complex.cmj
 complex_while_loop.cmo :
diff --git a/jscomp/test/complex_if.d.ts b/jscomp/test/complex_if.d.ts
deleted file mode 100644
index 0714e87423..0000000000
--- a/jscomp/test/complex_if.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export var fib: (n : any) => any ;
-
diff --git a/jscomp/test/complex_if.js b/jscomp/test/complex_if.js
deleted file mode 100644
index b1ff10eae4..0000000000
--- a/jscomp/test/complex_if.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Generated CODE, PLEASE EDIT WITH CARE
-"use strict";
-
-
-function fib(n) {
-  if (n !== 1 && n !== 23) {
-    return fib(n - 1) + fib(n - 2);
-  }
-  else {
-    return 11111123;
-  }
-}
-
-exports.fib = fib;
-/* No side effect */
diff --git a/jscomp/test/complex_if.ml b/jscomp/test/complex_if.ml
deleted file mode 100644
index 46af7aba81..0000000000
--- a/jscomp/test/complex_if.ml
+++ /dev/null
@@ -1,3 +0,0 @@
-let rec fib = function
-  | 1 | 23 -> 11111123
-  | n -> fib (n - 1 )  + fib (n - 2)
diff --git a/jscomp/test/complex_if_test.d.ts b/jscomp/test/complex_if_test.d.ts
new file mode 100644
index 0000000000..38741d6324
--- /dev/null
+++ b/jscomp/test/complex_if_test.d.ts
@@ -0,0 +1,5 @@
+export var fib: (n : any) => any ;
+export var escaped: (s : any) => any ;
+export var string_escaped: (s : any) => any ;
+export var suites: any ;
+
diff --git a/jscomp/test/complex_if_test.js b/jscomp/test/complex_if_test.js
new file mode 100644
index 0000000000..303c43cfac
--- /dev/null
+++ b/jscomp/test/complex_if_test.js
@@ -0,0 +1,160 @@
+// Generated CODE, PLEASE EDIT WITH CARE
+"use strict";
+
+var Bytes       = require("../stdlib/bytes");
+var Mt          = require("./mt");
+var Caml_string = require("../runtime/caml_string");
+
+function fib(n) {
+  if (n !== 1 && n !== 23) {
+    return fib(n - 1) + fib(n - 2);
+  }
+  else {
+    return 11111123;
+  }
+}
+
+function escaped(s) {
+  var n = 0;
+  for(var i = 0 ,i_finish = s.length - 1; i<= i_finish; ++i){
+    var match = s[i];
+    var $js;
+    if (match >= 32) {
+      var switcher = match - 34;
+      $js = switcher > 58 || switcher < 0 ? (
+          switcher >= 93 ? 4 : 1
+        ) : (
+          switcher > 57 || switcher < 1 ? 2 : 1
+        );
+    }
+    else {
+      $js = match >= 11 ? (
+          match !== 13 ? 4 : 2
+        ) : (
+          match >= 8 ? 2 : 4
+        );
+    }
+    n += $js;
+  }
+  if (n === s.length) {
+    return Bytes.copy(s);
+  }
+  else {
+    var s$prime = Caml_string.caml_create_string(n);
+    n = 0;
+    for(var i$1 = 0 ,i_finish$1 = s.length - 1; i$1<= i_finish$1; ++i$1){
+      var c = s[i$1];
+      var exit = 0;
+      if (c >= 35) {
+        if (c !== 92) {
+          if (c >= 127) {
+            exit = 1;
+          }
+          else {
+            s$prime[n] = c;
+          }
+        }
+        else {
+          exit = 2;
+        }
+      }
+      else if (c >= 32) {
+        if (c >= 34) {
+          exit = 2;
+        }
+        else {
+          s$prime[n] = c;
+        }
+      }
+      else if (c >= 14) {
+        exit = 1;
+      }
+      else {
+        switch (c) {
+          case 8 : 
+              s$prime[n] = /* "\\" */92;
+              ++ n;
+              s$prime[n] = /* "b" */98;
+              break;
+          case 9 : 
+              s$prime[n] = /* "\\" */92;
+              ++ n;
+              s$prime[n] = /* "t" */116;
+              break;
+          case 10 : 
+              s$prime[n] = /* "\\" */92;
+              ++ n;
+              s$prime[n] = /* "n" */110;
+              break;
+          case 0 : 
+          case 1 : 
+          case 2 : 
+          case 3 : 
+          case 4 : 
+          case 5 : 
+          case 6 : 
+          case 7 : 
+          case 11 : 
+          case 12 : 
+              exit = 1;
+              break;
+          case 13 : 
+              s$prime[n] = /* "\\" */92;
+              ++ n;
+              s$prime[n] = /* "r" */114;
+              break;
+          
+        }
+      }
+      switch (exit) {
+        case 1 : 
+            s$prime[n] = /* "\\" */92;
+            ++ n;
+            s$prime[n] = 48 + (c / 100 | 0);
+            ++ n;
+            s$prime[n] = 48 + (c / 10 | 0) % 10;
+            ++ n;
+            s$prime[n] = 48 + c % 10;
+            break;
+        case 2 : 
+            s$prime[n] = /* "\\" */92;
+            ++ n;
+            s$prime[n] = c;
+            break;
+        
+      }
+      ++ n;
+    }
+    return s$prime;
+  }
+}
+
+function string_escaped(s) {
+  return Bytes.to_string(escaped(Bytes.of_string(s)));
+}
+
+var suites_001 = [
+  /* tuple */0,
+  "complete_escape",
+  function () {
+    return [
+            /* Eq */0,
+            Bytes.to_string(escaped(Bytes.of_string("\0\x01\x02\x03\x04\x05\x06\x07\b\t\n\x0b\f\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"))),
+            "\\000\\001\\002\\003\\004\\005\\006\\007\\b\\t\\n\\011\\012\\r\\014\\015\\016\\017\\018\\019\\020\\021\\022\\023\\024\\025\\026\\027\\028\\029\\030\\031 !\\\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\\127\\128\\129\\130\\131\\132\\133\\134\\135\\136\\137\\138\\139\\140\\141\\142\\143\\144\\145\\146\\147\\148\\149\\150\\151\\152\\153\\154\\155\\156\\157\\158\\159\\160\\161\\162\\163\\164\\165\\166\\167\\168\\169\\170\\171\\172\\173\\174\\175\\176\\177\\178\\179\\180\\181\\182\\183\\184\\185\\186\\187\\188\\189\\190\\191\\192\\193\\194\\195\\196\\197\\198\\199\\200\\201\\202\\203\\204\\205\\206\\207\\208\\209\\210\\211\\212\\213\\214\\215\\216\\217\\218\\219\\220\\221\\222\\223\\224\\225\\226\\227\\228\\229\\230\\231\\232\\233\\234\\235\\236\\237\\238\\239\\240\\241\\242\\243\\244\\245\\246\\247\\248\\249\\250\\251\\252\\253\\254\\255"
+          ];
+  }
+];
+
+var suites = [
+  /* :: */0,
+  suites_001,
+  /* [] */0
+];
+
+Mt.from_pair_suites("complex_if_test.ml", suites);
+
+exports.fib            = fib;
+exports.escaped        = escaped;
+exports.string_escaped = string_escaped;
+exports.suites         = suites;
+/*  Not a pure module */
diff --git a/jscomp/test/complex_if_test.ml b/jscomp/test/complex_if_test.ml
new file mode 100644
index 0000000000..26b5e558ec
--- /dev/null
+++ b/jscomp/test/complex_if_test.ml
@@ -0,0 +1,59 @@
+let rec fib = function
+  | 1 | 23 -> 11111123
+  | n -> fib (n - 1 )  + fib (n - 2)
+
+open Bytes
+external char_code: char -> int = "%identity"
+external char_chr: int -> char = "%identity"
+
+
+let escaped s =
+  let n = ref 0 in
+  for i = 0 to length s - 1 do
+    n := !n +
+      (match unsafe_get s i with
+      | '\"' | '\\' | '\n' | '\t' | '\r' | '\b' -> 2
+      | ' ' .. '~' -> 1
+      | _ -> 4)
+  done;
+  if !n = length s then copy s else begin
+    let s' = create !n in
+    n := 0;
+    for i = 0 to length s - 1 do
+      begin match unsafe_get s i with
+      | ('\"' | '\\') as c ->
+          unsafe_set s' !n '\\'; incr n; unsafe_set s' !n c
+      | '\n' ->
+          unsafe_set s' !n '\\'; incr n; unsafe_set s' !n 'n'
+      | '\t' ->
+          unsafe_set s' !n '\\'; incr n; unsafe_set s' !n 't'
+      | '\r' ->
+          unsafe_set s' !n '\\'; incr n; unsafe_set s' !n 'r'
+      | '\b' ->
+          unsafe_set s' !n '\\'; incr n; unsafe_set s' !n 'b'
+      | (' ' .. '~') as c -> unsafe_set s' !n c
+      | c ->
+          let a = char_code c in
+          unsafe_set s' !n '\\';
+          incr n;
+          unsafe_set s' !n (char_chr (48 + a / 100));
+          incr n;
+          unsafe_set s' !n (char_chr (48 + (a / 10) mod 10));
+          incr n;
+          unsafe_set s' !n (char_chr (48 + a mod 10));
+      end;
+      incr n
+    done;
+    s'
+  end
+let string_escaped s = Bytes.to_string (escaped (Bytes.of_string s ))
+
+
+(* let s = (let v = ref "" in for i = 0 to 255 do v := !v ^ (String.make 1 (Char.chr i)) done ; !v);; *)
+let suites = Mt.[
+    "complete_escape", (fun _ -> 
+        Eq( string_escaped "\000\001\002\003\004\005\006\007\b\t\n\011\012\r\014\015\016\017\018\019\020\021\022\023\024\025\026\027\028\029\030\031 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\127\128\129\130\131\132\133\134\135\136\137\138\139\140\141\142\143\144\145\146\147\148\149\150\151\152\153\154\155\156\157\158\159\160\161\162\163\164\165\166\167\168\169\170\171\172\173\174\175\176\177\178\179\180\181\182\183\184\185\186\187\188\189\190\191\192\193\194\195\196\197\198\199\200\201\202\203\204\205\206\207\208\209\210\211\212\213\214\215\216\217\218\219\220\221\222\223\224\225\226\227\228\229\230\231\232\233\234\235\236\237\238\239\240\241\242\243\244\245\246\247\248\249\250\251\252\253\254\255", "\\000\\001\\002\\003\\004\\005\\006\\007\\b\\t\\n\\011\\012\\r\\014\\015\\016\\017\\018\\019\\020\\021\\022\\023\\024\\025\\026\\027\\028\\029\\030\\031 !\\\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\\127\\128\\129\\130\\131\\132\\133\\134\\135\\136\\137\\138\\139\\140\\141\\142\\143\\144\\145\\146\\147\\148\\149\\150\\151\\152\\153\\154\\155\\156\\157\\158\\159\\160\\161\\162\\163\\164\\165\\166\\167\\168\\169\\170\\171\\172\\173\\174\\175\\176\\177\\178\\179\\180\\181\\182\\183\\184\\185\\186\\187\\188\\189\\190\\191\\192\\193\\194\\195\\196\\197\\198\\199\\200\\201\\202\\203\\204\\205\\206\\207\\208\\209\\210\\211\\212\\213\\214\\215\\216\\217\\218\\219\\220\\221\\222\\223\\224\\225\\226\\227\\228\\229\\230\\231\\232\\233\\234\\235\\236\\237\\238\\239\\240\\241\\242\\243\\244\\245\\246\\247\\248\\249\\250\\251\\252\\253\\254\\255"
+          )
+      )   
+  ]
+;; Mt.from_pair_suites __FILE__ suites
diff --git a/jscomp/test/lib_js_test.ml b/jscomp/test/lib_js_test.ml
index 849459eec3..0a60ccad3c 100644
--- a/jscomp/test/lib_js_test.ml
+++ b/jscomp/test/lib_js_test.ml
@@ -9,7 +9,9 @@ let () =
   end
 
 let suites = Mt.[
-    "anything_to_string", (fun _ -> Eq("3", Js.anything_to_string 3 ))    
+    "anything_to_string", (fun _ -> Eq("3", Js.anything_to_string 3 ));
+    (* in js, array is printed as {[ 1,2 ]} without brackets *)    
+    (* "array_to_string", (fun _ -> Eq("[0]", Js.anything_to_string [|0|]))     *)
 ]
 
 ;; Mt.from_pair_suites __FILE__ suites
diff --git a/jscomp/test/test.mllib b/jscomp/test/test.mllib
index 83e1ea3998..976aa9ba02 100644
--- a/jscomp/test/test.mllib
+++ b/jscomp/test/test.mllib
@@ -153,4 +153,4 @@ lib_js_test
 small_inline_test
 ari_regress_test
 record_with_test
-complex_if
\ No newline at end of file
+complex_if_test
\ No newline at end of file