diff --git a/test/suite/ch13/S13_A1.js b/test/suite/ch13/13.0/S13_A1.js
similarity index 100%
rename from test/suite/ch13/S13_A1.js
rename to test/suite/ch13/13.0/S13_A1.js
diff --git a/test/suite/ch13/S13_A10.js b/test/suite/ch13/13.0/S13_A10.js
similarity index 100%
rename from test/suite/ch13/S13_A10.js
rename to test/suite/ch13/13.0/S13_A10.js
diff --git a/test/suite/ch13/S13_A11_T1.js b/test/suite/ch13/13.0/S13_A11_T1.js
similarity index 100%
rename from test/suite/ch13/S13_A11_T1.js
rename to test/suite/ch13/13.0/S13_A11_T1.js
diff --git a/test/suite/ch13/S13_A11_T2.js b/test/suite/ch13/13.0/S13_A11_T2.js
similarity index 100%
rename from test/suite/ch13/S13_A11_T2.js
rename to test/suite/ch13/13.0/S13_A11_T2.js
diff --git a/test/suite/ch13/S13_A11_T3.js b/test/suite/ch13/13.0/S13_A11_T3.js
similarity index 100%
rename from test/suite/ch13/S13_A11_T3.js
rename to test/suite/ch13/13.0/S13_A11_T3.js
diff --git a/test/suite/ch13/S13_A11_T4.js b/test/suite/ch13/13.0/S13_A11_T4.js
similarity index 100%
rename from test/suite/ch13/S13_A11_T4.js
rename to test/suite/ch13/13.0/S13_A11_T4.js
diff --git a/test/suite/ch13/S13_A12_T1.js b/test/suite/ch13/13.0/S13_A12_T1.js
similarity index 100%
rename from test/suite/ch13/S13_A12_T1.js
rename to test/suite/ch13/13.0/S13_A12_T1.js
diff --git a/test/suite/ch13/S13_A12_T2.js b/test/suite/ch13/13.0/S13_A12_T2.js
similarity index 100%
rename from test/suite/ch13/S13_A12_T2.js
rename to test/suite/ch13/13.0/S13_A12_T2.js
diff --git a/test/suite/ch13/S13_A13_T1.js b/test/suite/ch13/13.0/S13_A13_T1.js
similarity index 100%
rename from test/suite/ch13/S13_A13_T1.js
rename to test/suite/ch13/13.0/S13_A13_T1.js
diff --git a/test/suite/ch13/S13_A13_T2.js b/test/suite/ch13/13.0/S13_A13_T2.js
similarity index 100%
rename from test/suite/ch13/S13_A13_T2.js
rename to test/suite/ch13/13.0/S13_A13_T2.js
diff --git a/test/suite/ch13/S13_A13_T3.js b/test/suite/ch13/13.0/S13_A13_T3.js
similarity index 100%
rename from test/suite/ch13/S13_A13_T3.js
rename to test/suite/ch13/13.0/S13_A13_T3.js
diff --git a/test/suite/ch13/S13_A14.js b/test/suite/ch13/13.0/S13_A14.js
similarity index 100%
rename from test/suite/ch13/S13_A14.js
rename to test/suite/ch13/13.0/S13_A14.js
diff --git a/test/suite/ch13/S13_A15_T1.js b/test/suite/ch13/13.0/S13_A15_T1.js
similarity index 100%
rename from test/suite/ch13/S13_A15_T1.js
rename to test/suite/ch13/13.0/S13_A15_T1.js
diff --git a/test/suite/ch13/S13_A15_T2.js b/test/suite/ch13/13.0/S13_A15_T2.js
similarity index 100%
rename from test/suite/ch13/S13_A15_T2.js
rename to test/suite/ch13/13.0/S13_A15_T2.js
diff --git a/test/suite/ch13/S13_A15_T3.js b/test/suite/ch13/13.0/S13_A15_T3.js
similarity index 100%
rename from test/suite/ch13/S13_A15_T3.js
rename to test/suite/ch13/13.0/S13_A15_T3.js
diff --git a/test/suite/ch13/S13_A15_T4.js b/test/suite/ch13/13.0/S13_A15_T4.js
similarity index 100%
rename from test/suite/ch13/S13_A15_T4.js
rename to test/suite/ch13/13.0/S13_A15_T4.js
diff --git a/test/suite/ch13/S13_A15_T5.js b/test/suite/ch13/13.0/S13_A15_T5.js
similarity index 100%
rename from test/suite/ch13/S13_A15_T5.js
rename to test/suite/ch13/13.0/S13_A15_T5.js
diff --git a/test/suite/ch13/S13_A16.js b/test/suite/ch13/13.0/S13_A16.js
similarity index 100%
rename from test/suite/ch13/S13_A16.js
rename to test/suite/ch13/13.0/S13_A16.js
diff --git a/test/suite/ch13/S13_A17_T1.js b/test/suite/ch13/13.0/S13_A17_T1.js
similarity index 100%
rename from test/suite/ch13/S13_A17_T1.js
rename to test/suite/ch13/13.0/S13_A17_T1.js
diff --git a/test/suite/ch13/S13_A17_T2.js b/test/suite/ch13/13.0/S13_A17_T2.js
similarity index 100%
rename from test/suite/ch13/S13_A17_T2.js
rename to test/suite/ch13/13.0/S13_A17_T2.js
diff --git a/test/suite/ch13/S13_A18.js b/test/suite/ch13/13.0/S13_A18.js
similarity index 100%
rename from test/suite/ch13/S13_A18.js
rename to test/suite/ch13/13.0/S13_A18.js
diff --git a/test/suite/ch13/S13_A19_T1.js b/test/suite/ch13/13.0/S13_A19_T1.js
similarity index 100%
rename from test/suite/ch13/S13_A19_T1.js
rename to test/suite/ch13/13.0/S13_A19_T1.js
diff --git a/test/suite/ch13/S13_A19_T2.js b/test/suite/ch13/13.0/S13_A19_T2.js
similarity index 100%
rename from test/suite/ch13/S13_A19_T2.js
rename to test/suite/ch13/13.0/S13_A19_T2.js
diff --git a/test/suite/ch13/S13_A2_T1.js b/test/suite/ch13/13.0/S13_A2_T1.js
similarity index 100%
rename from test/suite/ch13/S13_A2_T1.js
rename to test/suite/ch13/13.0/S13_A2_T1.js
diff --git a/test/suite/ch13/S13_A2_T2.js b/test/suite/ch13/13.0/S13_A2_T2.js
similarity index 100%
rename from test/suite/ch13/S13_A2_T2.js
rename to test/suite/ch13/13.0/S13_A2_T2.js
diff --git a/test/suite/ch13/S13_A2_T3.js b/test/suite/ch13/13.0/S13_A2_T3.js
similarity index 100%
rename from test/suite/ch13/S13_A2_T3.js
rename to test/suite/ch13/13.0/S13_A2_T3.js
diff --git a/test/suite/ch13/S13_A3_T1.js b/test/suite/ch13/13.0/S13_A3_T1.js
similarity index 100%
rename from test/suite/ch13/S13_A3_T1.js
rename to test/suite/ch13/13.0/S13_A3_T1.js
diff --git a/test/suite/ch13/S13_A3_T2.js b/test/suite/ch13/13.0/S13_A3_T2.js
similarity index 100%
rename from test/suite/ch13/S13_A3_T2.js
rename to test/suite/ch13/13.0/S13_A3_T2.js
diff --git a/test/suite/ch13/S13_A3_T3.js b/test/suite/ch13/13.0/S13_A3_T3.js
similarity index 100%
rename from test/suite/ch13/S13_A3_T3.js
rename to test/suite/ch13/13.0/S13_A3_T3.js
diff --git a/test/suite/ch13/S13_A4_T1.js b/test/suite/ch13/13.0/S13_A4_T1.js
similarity index 100%
rename from test/suite/ch13/S13_A4_T1.js
rename to test/suite/ch13/13.0/S13_A4_T1.js
diff --git a/test/suite/ch13/S13_A4_T2.js b/test/suite/ch13/13.0/S13_A4_T2.js
similarity index 100%
rename from test/suite/ch13/S13_A4_T2.js
rename to test/suite/ch13/13.0/S13_A4_T2.js
diff --git a/test/suite/ch13/S13_A4_T3.js b/test/suite/ch13/13.0/S13_A4_T3.js
similarity index 100%
rename from test/suite/ch13/S13_A4_T3.js
rename to test/suite/ch13/13.0/S13_A4_T3.js
diff --git a/test/suite/ch13/S13_A4_T4.js b/test/suite/ch13/13.0/S13_A4_T4.js
similarity index 100%
rename from test/suite/ch13/S13_A4_T4.js
rename to test/suite/ch13/13.0/S13_A4_T4.js
diff --git a/test/suite/ch13/S13_A6_T1.js b/test/suite/ch13/13.0/S13_A6_T1.js
similarity index 100%
rename from test/suite/ch13/S13_A6_T1.js
rename to test/suite/ch13/13.0/S13_A6_T1.js
diff --git a/test/suite/ch13/S13_A6_T2.js b/test/suite/ch13/13.0/S13_A6_T2.js
similarity index 100%
rename from test/suite/ch13/S13_A6_T2.js
rename to test/suite/ch13/13.0/S13_A6_T2.js
diff --git a/test/suite/ch13/S13_A7_T1.js b/test/suite/ch13/13.0/S13_A7_T1.js
similarity index 100%
rename from test/suite/ch13/S13_A7_T1.js
rename to test/suite/ch13/13.0/S13_A7_T1.js
diff --git a/test/suite/ch13/S13_A7_T2.js b/test/suite/ch13/13.0/S13_A7_T2.js
similarity index 100%
rename from test/suite/ch13/S13_A7_T2.js
rename to test/suite/ch13/13.0/S13_A7_T2.js
diff --git a/test/suite/ch13/S13_A7_T3.js b/test/suite/ch13/13.0/S13_A7_T3.js
similarity index 100%
rename from test/suite/ch13/S13_A7_T3.js
rename to test/suite/ch13/13.0/S13_A7_T3.js
diff --git a/test/suite/ch13/S13_A8_T1.js b/test/suite/ch13/13.0/S13_A8_T1.js
similarity index 100%
rename from test/suite/ch13/S13_A8_T1.js
rename to test/suite/ch13/13.0/S13_A8_T1.js
diff --git a/test/suite/ch13/S13_A8_T2.js b/test/suite/ch13/13.0/S13_A8_T2.js
similarity index 100%
rename from test/suite/ch13/S13_A8_T2.js
rename to test/suite/ch13/13.0/S13_A8_T2.js
diff --git a/test/suite/ch13/S13_A9.js b/test/suite/ch13/13.0/S13_A9.js
similarity index 100%
rename from test/suite/ch13/S13_A9.js
rename to test/suite/ch13/13.0/S13_A9.js
diff --git a/test/suite/ch14/S14_A1.js b/test/suite/ch14/14.0/S14_A1.js
similarity index 100%
rename from test/suite/ch14/S14_A1.js
rename to test/suite/ch14/14.0/S14_A1.js
diff --git a/test/suite/ch14/S14_A2.js b/test/suite/ch14/14.0/S14_A2.js
similarity index 100%
rename from test/suite/ch14/S14_A2.js
rename to test/suite/ch14/14.0/S14_A2.js
diff --git a/test/suite/ch14/S14_A3.js b/test/suite/ch14/14.0/S14_A3.js
similarity index 100%
rename from test/suite/ch14/S14_A3.js
rename to test/suite/ch14/14.0/S14_A3.js
diff --git a/test/suite/ch14/S14_A5_T1.js b/test/suite/ch14/14.0/S14_A5_T1.js
similarity index 100%
rename from test/suite/ch14/S14_A5_T1.js
rename to test/suite/ch14/14.0/S14_A5_T1.js
diff --git a/test/suite/ch14/S14_A5_T2.js b/test/suite/ch14/14.0/S14_A5_T2.js
similarity index 100%
rename from test/suite/ch14/S14_A5_T2.js
rename to test/suite/ch14/14.0/S14_A5_T2.js