From bd7c280e92c500c2397942cd7598b0945335647b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bargull?= <andre.bargull@gmail.com>
Date: Tue, 2 May 2017 12:09:22 -0700
Subject: [PATCH] Rename and consolidate tests in reserved-words directory

---
 test/language/reserved-words/7.6.1-1-1.js     |  27 ---
 test/language/reserved-words/7.6.1-1-10.js    |  27 ---
 test/language/reserved-words/7.6.1-1-11.js    |  27 ---
 test/language/reserved-words/7.6.1-1-12.js    |  27 ---
 test/language/reserved-words/7.6.1-1-13.js    |  27 ---
 test/language/reserved-words/7.6.1-1-14.js    |  27 ---
 test/language/reserved-words/7.6.1-1-15.js    |  27 ---
 test/language/reserved-words/7.6.1-1-16.js    |  27 ---
 test/language/reserved-words/7.6.1-1-2.js     |  27 ---
 test/language/reserved-words/7.6.1-1-3.js     |  27 ---
 test/language/reserved-words/7.6.1-1-4.js     |  27 ---
 test/language/reserved-words/7.6.1-1-5.js     |  27 ---
 test/language/reserved-words/7.6.1-1-6.js     |  27 ---
 test/language/reserved-words/7.6.1-1-7.js     |  27 ---
 test/language/reserved-words/7.6.1-1-8.js     |  27 ---
 test/language/reserved-words/7.6.1-1-9.js     |  27 ---
 test/language/reserved-words/7.6.1-2-1.js     |  26 ---
 test/language/reserved-words/7.6.1-2-10.js    |  26 ---
 test/language/reserved-words/7.6.1-2-11.js    |  26 ---
 test/language/reserved-words/7.6.1-2-12.js    |  26 ---
 test/language/reserved-words/7.6.1-2-13.js    |  26 ---
 test/language/reserved-words/7.6.1-2-14.js    |  26 ---
 test/language/reserved-words/7.6.1-2-15.js    |  26 ---
 test/language/reserved-words/7.6.1-2-16.js    |  26 ---
 test/language/reserved-words/7.6.1-2-2.js     |  26 ---
 test/language/reserved-words/7.6.1-2-3.js     |  26 ---
 test/language/reserved-words/7.6.1-2-4.js     |  26 ---
 test/language/reserved-words/7.6.1-2-5.js     |  26 ---
 test/language/reserved-words/7.6.1-2-6.js     |  26 ---
 test/language/reserved-words/7.6.1-2-7.js     |  26 ---
 test/language/reserved-words/7.6.1-2-8.js     |  26 ---
 test/language/reserved-words/7.6.1-2-9.js     |  26 ---
 test/language/reserved-words/7.6.1-3-1.js     |  26 ---
 test/language/reserved-words/7.6.1-3-10.js    |  26 ---
 test/language/reserved-words/7.6.1-3-11.js    |  26 ---
 test/language/reserved-words/7.6.1-3-12.js    |  26 ---
 test/language/reserved-words/7.6.1-3-13.js    |  26 ---
 test/language/reserved-words/7.6.1-3-14.js    |  26 ---
 test/language/reserved-words/7.6.1-3-15.js    |  26 ---
 test/language/reserved-words/7.6.1-3-16.js    |  26 ---
 test/language/reserved-words/7.6.1-3-2.js     |  26 ---
 test/language/reserved-words/7.6.1-3-3.js     |  26 ---
 test/language/reserved-words/7.6.1-3-4.js     |  26 ---
 test/language/reserved-words/7.6.1-3-5.js     |  26 ---
 test/language/reserved-words/7.6.1-3-6.js     |  26 ---
 test/language/reserved-words/7.6.1-3-7.js     |  26 ---
 test/language/reserved-words/7.6.1-3-8.js     |  26 ---
 test/language/reserved-words/7.6.1-3-9.js     |  26 ---
 test/language/reserved-words/7.6.1-4-1.js     |  43 -----
 test/language/reserved-words/7.6.1-4-10.js    |  43 -----
 test/language/reserved-words/7.6.1-4-11.js    |  43 -----
 test/language/reserved-words/7.6.1-4-12.js    |  43 -----
 test/language/reserved-words/7.6.1-4-13.js    |  43 -----
 test/language/reserved-words/7.6.1-4-14.js    |  43 -----
 test/language/reserved-words/7.6.1-4-15.js    |  43 -----
 test/language/reserved-words/7.6.1-4-16.js    |  43 -----
 test/language/reserved-words/7.6.1-4-2.js     |  43 -----
 test/language/reserved-words/7.6.1-4-3.js     |  43 -----
 test/language/reserved-words/7.6.1-4-4.js     |  43 -----
 test/language/reserved-words/7.6.1-4-5.js     |  43 -----
 test/language/reserved-words/7.6.1-4-6.js     |  43 -----
 test/language/reserved-words/7.6.1-4-7.js     |  43 -----
 test/language/reserved-words/7.6.1-4-8.js     |  43 -----
 test/language/reserved-words/7.6.1-4-9.js     |  43 -----
 test/language/reserved-words/7.6.1-5-1.js     |  23 ---
 test/language/reserved-words/7.6.1-5-10.js    |  23 ---
 test/language/reserved-words/7.6.1-5-11.js    |  23 ---
 test/language/reserved-words/7.6.1-5-12.js    |  23 ---
 test/language/reserved-words/7.6.1-5-13.js    |  23 ---
 test/language/reserved-words/7.6.1-5-14.js    |  23 ---
 test/language/reserved-words/7.6.1-5-15.js    |  23 ---
 test/language/reserved-words/7.6.1-5-16.js    |  23 ---
 test/language/reserved-words/7.6.1-5-2.js     |  23 ---
 test/language/reserved-words/7.6.1-5-3.js     |  23 ---
 test/language/reserved-words/7.6.1-5-4.js     |  23 ---
 test/language/reserved-words/7.6.1-5-5.js     |  23 ---
 test/language/reserved-words/7.6.1-5-6.js     |  23 ---
 test/language/reserved-words/7.6.1-5-7.js     |  23 ---
 test/language/reserved-words/7.6.1-5-8.js     |  23 ---
 test/language/reserved-words/7.6.1-5-9.js     |  23 ---
 test/language/reserved-words/7.6.1-6-1.js     |  22 ---
 test/language/reserved-words/7.6.1-6-10.js    |  22 ---
 test/language/reserved-words/7.6.1-6-11.js    |  22 ---
 test/language/reserved-words/7.6.1-6-12.js    |  22 ---
 test/language/reserved-words/7.6.1-6-13.js    |  22 ---
 test/language/reserved-words/7.6.1-6-14.js    |  22 ---
 test/language/reserved-words/7.6.1-6-15.js    |  22 ---
 test/language/reserved-words/7.6.1-6-16.js    |  22 ---
 test/language/reserved-words/7.6.1-6-2.js     |  22 ---
 test/language/reserved-words/7.6.1-6-3.js     |  22 ---
 test/language/reserved-words/7.6.1-6-4.js     |  22 ---
 test/language/reserved-words/7.6.1-6-5.js     |  22 ---
 test/language/reserved-words/7.6.1-6-6.js     |  22 ---
 test/language/reserved-words/7.6.1-6-7.js     |  22 ---
 test/language/reserved-words/7.6.1-6-8.js     |  22 ---
 test/language/reserved-words/7.6.1-6-9.js     |  22 ---
 test/language/reserved-words/7.6.1-7-1.js     |  22 ---
 test/language/reserved-words/7.6.1-7-10.js    |  22 ---
 test/language/reserved-words/7.6.1-7-11.js    |  22 ---
 test/language/reserved-words/7.6.1-7-12.js    |  22 ---
 test/language/reserved-words/7.6.1-7-13.js    |  22 ---
 test/language/reserved-words/7.6.1-7-14.js    |  22 ---
 test/language/reserved-words/7.6.1-7-15.js    |  22 ---
 test/language/reserved-words/7.6.1-7-16.js    |  22 ---
 test/language/reserved-words/7.6.1-7-2.js     |  22 ---
 test/language/reserved-words/7.6.1-7-3.js     |  22 ---
 test/language/reserved-words/7.6.1-7-4.js     |  22 ---
 test/language/reserved-words/7.6.1-7-5.js     |  22 ---
 test/language/reserved-words/7.6.1-7-6.js     |  22 ---
 test/language/reserved-words/7.6.1-7-7.js     |  22 ---
 test/language/reserved-words/7.6.1-7-8.js     |  22 ---
 test/language/reserved-words/7.6.1-7-9.js     |  22 ---
 test/language/reserved-words/7.6.1-8-1.js     |  39 -----
 test/language/reserved-words/7.6.1-8-10.js    |  39 -----
 test/language/reserved-words/7.6.1-8-11.js    |  39 -----
 test/language/reserved-words/7.6.1-8-12.js    |  39 -----
 test/language/reserved-words/7.6.1-8-13.js    |  39 -----
 test/language/reserved-words/7.6.1-8-14.js    |  39 -----
 test/language/reserved-words/7.6.1-8-15.js    |  39 -----
 test/language/reserved-words/7.6.1-8-16.js    |  39 -----
 test/language/reserved-words/7.6.1-8-2.js     |  39 -----
 test/language/reserved-words/7.6.1-8-3.js     |  39 -----
 test/language/reserved-words/7.6.1-8-4.js     |  39 -----
 test/language/reserved-words/7.6.1-8-5.js     |  39 -----
 test/language/reserved-words/7.6.1-8-6.js     |  39 -----
 test/language/reserved-words/7.6.1-8-7.js     |  39 -----
 test/language/reserved-words/7.6.1-8-8.js     |  39 -----
 test/language/reserved-words/7.6.1-8-9.js     |  39 -----
 test/language/reserved-words/7.6.1.2-1gs.js   |  15 --
 test/language/reserved-words/S7.6.1_A1.1.js   |  13 --
 test/language/reserved-words/S7.6.1_A1.2.js   |  13 --
 test/language/reserved-words/S7.6.1_A1.3.js   |  13 --
 .../ident-name-global-property-accessor.js    |  39 +++++
 ...ent-name-global-property-memberexpr-str.js |  30 ++++
 .../ident-name-global-property-memberexpr.js  |  30 ++++
 .../ident-name-global-property-prop-name.js   |  30 ++++
 .../ident-name-keyword-accessor.js            | 165 ++++++++++++++++++
 .../ident-name-keyword-memberexpr-str.js      | 117 +++++++++++++
 .../ident-name-keyword-memberexpr.js          | 116 ++++++++++++
 .../ident-name-keyword-prop-name.js           | 116 ++++++++++++
 ...ent-name-reserved-word-literal-accessor.js |  39 +++++
 ...me-reserved-word-literal-memberexpr-str.js |  30 ++++
 ...t-name-reserved-word-literal-memberexpr.js |  30 ++++
 ...nt-name-reserved-word-literal-prop-name.js |  30 ++++
 .../ident-reference-false-escaped.js          |  18 ++
 .../reserved-words/ident-reference-false.js   |  21 +++
 .../ident-reference-null-escaped.js           |  18 ++
 .../reserved-words/ident-reference-null.js    |  21 +++
 .../ident-reference-true-escaped.js           |  18 ++
 .../reserved-words/ident-reference-true.js    |  21 +++
 .../label-ident-false-escaped.js              |  18 ++
 .../reserved-words/label-ident-false.js       |  18 ++
 .../label-ident-null-escaped.js               |  18 ++
 .../reserved-words/label-ident-null.js        |  18 ++
 .../label-ident-true-escaped.js               |  18 ++
 .../reserved-words/label-ident-true.js        |  18 ++
 .../{S7.6.1_A2.js => unreserved-words.js}     |   0
 157 files changed, 997 insertions(+), 3702 deletions(-)
 delete mode 100644 test/language/reserved-words/7.6.1-1-1.js
 delete mode 100644 test/language/reserved-words/7.6.1-1-10.js
 delete mode 100644 test/language/reserved-words/7.6.1-1-11.js
 delete mode 100644 test/language/reserved-words/7.6.1-1-12.js
 delete mode 100644 test/language/reserved-words/7.6.1-1-13.js
 delete mode 100644 test/language/reserved-words/7.6.1-1-14.js
 delete mode 100644 test/language/reserved-words/7.6.1-1-15.js
 delete mode 100644 test/language/reserved-words/7.6.1-1-16.js
 delete mode 100644 test/language/reserved-words/7.6.1-1-2.js
 delete mode 100644 test/language/reserved-words/7.6.1-1-3.js
 delete mode 100644 test/language/reserved-words/7.6.1-1-4.js
 delete mode 100644 test/language/reserved-words/7.6.1-1-5.js
 delete mode 100644 test/language/reserved-words/7.6.1-1-6.js
 delete mode 100644 test/language/reserved-words/7.6.1-1-7.js
 delete mode 100644 test/language/reserved-words/7.6.1-1-8.js
 delete mode 100644 test/language/reserved-words/7.6.1-1-9.js
 delete mode 100644 test/language/reserved-words/7.6.1-2-1.js
 delete mode 100644 test/language/reserved-words/7.6.1-2-10.js
 delete mode 100644 test/language/reserved-words/7.6.1-2-11.js
 delete mode 100644 test/language/reserved-words/7.6.1-2-12.js
 delete mode 100644 test/language/reserved-words/7.6.1-2-13.js
 delete mode 100644 test/language/reserved-words/7.6.1-2-14.js
 delete mode 100644 test/language/reserved-words/7.6.1-2-15.js
 delete mode 100644 test/language/reserved-words/7.6.1-2-16.js
 delete mode 100644 test/language/reserved-words/7.6.1-2-2.js
 delete mode 100644 test/language/reserved-words/7.6.1-2-3.js
 delete mode 100644 test/language/reserved-words/7.6.1-2-4.js
 delete mode 100644 test/language/reserved-words/7.6.1-2-5.js
 delete mode 100644 test/language/reserved-words/7.6.1-2-6.js
 delete mode 100644 test/language/reserved-words/7.6.1-2-7.js
 delete mode 100644 test/language/reserved-words/7.6.1-2-8.js
 delete mode 100644 test/language/reserved-words/7.6.1-2-9.js
 delete mode 100644 test/language/reserved-words/7.6.1-3-1.js
 delete mode 100644 test/language/reserved-words/7.6.1-3-10.js
 delete mode 100644 test/language/reserved-words/7.6.1-3-11.js
 delete mode 100644 test/language/reserved-words/7.6.1-3-12.js
 delete mode 100644 test/language/reserved-words/7.6.1-3-13.js
 delete mode 100644 test/language/reserved-words/7.6.1-3-14.js
 delete mode 100644 test/language/reserved-words/7.6.1-3-15.js
 delete mode 100644 test/language/reserved-words/7.6.1-3-16.js
 delete mode 100644 test/language/reserved-words/7.6.1-3-2.js
 delete mode 100644 test/language/reserved-words/7.6.1-3-3.js
 delete mode 100644 test/language/reserved-words/7.6.1-3-4.js
 delete mode 100644 test/language/reserved-words/7.6.1-3-5.js
 delete mode 100644 test/language/reserved-words/7.6.1-3-6.js
 delete mode 100644 test/language/reserved-words/7.6.1-3-7.js
 delete mode 100644 test/language/reserved-words/7.6.1-3-8.js
 delete mode 100644 test/language/reserved-words/7.6.1-3-9.js
 delete mode 100644 test/language/reserved-words/7.6.1-4-1.js
 delete mode 100644 test/language/reserved-words/7.6.1-4-10.js
 delete mode 100644 test/language/reserved-words/7.6.1-4-11.js
 delete mode 100644 test/language/reserved-words/7.6.1-4-12.js
 delete mode 100644 test/language/reserved-words/7.6.1-4-13.js
 delete mode 100644 test/language/reserved-words/7.6.1-4-14.js
 delete mode 100644 test/language/reserved-words/7.6.1-4-15.js
 delete mode 100644 test/language/reserved-words/7.6.1-4-16.js
 delete mode 100644 test/language/reserved-words/7.6.1-4-2.js
 delete mode 100644 test/language/reserved-words/7.6.1-4-3.js
 delete mode 100644 test/language/reserved-words/7.6.1-4-4.js
 delete mode 100644 test/language/reserved-words/7.6.1-4-5.js
 delete mode 100644 test/language/reserved-words/7.6.1-4-6.js
 delete mode 100644 test/language/reserved-words/7.6.1-4-7.js
 delete mode 100644 test/language/reserved-words/7.6.1-4-8.js
 delete mode 100644 test/language/reserved-words/7.6.1-4-9.js
 delete mode 100644 test/language/reserved-words/7.6.1-5-1.js
 delete mode 100644 test/language/reserved-words/7.6.1-5-10.js
 delete mode 100644 test/language/reserved-words/7.6.1-5-11.js
 delete mode 100644 test/language/reserved-words/7.6.1-5-12.js
 delete mode 100644 test/language/reserved-words/7.6.1-5-13.js
 delete mode 100644 test/language/reserved-words/7.6.1-5-14.js
 delete mode 100644 test/language/reserved-words/7.6.1-5-15.js
 delete mode 100644 test/language/reserved-words/7.6.1-5-16.js
 delete mode 100644 test/language/reserved-words/7.6.1-5-2.js
 delete mode 100644 test/language/reserved-words/7.6.1-5-3.js
 delete mode 100644 test/language/reserved-words/7.6.1-5-4.js
 delete mode 100644 test/language/reserved-words/7.6.1-5-5.js
 delete mode 100644 test/language/reserved-words/7.6.1-5-6.js
 delete mode 100644 test/language/reserved-words/7.6.1-5-7.js
 delete mode 100644 test/language/reserved-words/7.6.1-5-8.js
 delete mode 100644 test/language/reserved-words/7.6.1-5-9.js
 delete mode 100644 test/language/reserved-words/7.6.1-6-1.js
 delete mode 100644 test/language/reserved-words/7.6.1-6-10.js
 delete mode 100644 test/language/reserved-words/7.6.1-6-11.js
 delete mode 100644 test/language/reserved-words/7.6.1-6-12.js
 delete mode 100644 test/language/reserved-words/7.6.1-6-13.js
 delete mode 100644 test/language/reserved-words/7.6.1-6-14.js
 delete mode 100644 test/language/reserved-words/7.6.1-6-15.js
 delete mode 100644 test/language/reserved-words/7.6.1-6-16.js
 delete mode 100644 test/language/reserved-words/7.6.1-6-2.js
 delete mode 100644 test/language/reserved-words/7.6.1-6-3.js
 delete mode 100644 test/language/reserved-words/7.6.1-6-4.js
 delete mode 100644 test/language/reserved-words/7.6.1-6-5.js
 delete mode 100644 test/language/reserved-words/7.6.1-6-6.js
 delete mode 100644 test/language/reserved-words/7.6.1-6-7.js
 delete mode 100644 test/language/reserved-words/7.6.1-6-8.js
 delete mode 100644 test/language/reserved-words/7.6.1-6-9.js
 delete mode 100644 test/language/reserved-words/7.6.1-7-1.js
 delete mode 100644 test/language/reserved-words/7.6.1-7-10.js
 delete mode 100644 test/language/reserved-words/7.6.1-7-11.js
 delete mode 100644 test/language/reserved-words/7.6.1-7-12.js
 delete mode 100644 test/language/reserved-words/7.6.1-7-13.js
 delete mode 100644 test/language/reserved-words/7.6.1-7-14.js
 delete mode 100644 test/language/reserved-words/7.6.1-7-15.js
 delete mode 100644 test/language/reserved-words/7.6.1-7-16.js
 delete mode 100644 test/language/reserved-words/7.6.1-7-2.js
 delete mode 100644 test/language/reserved-words/7.6.1-7-3.js
 delete mode 100644 test/language/reserved-words/7.6.1-7-4.js
 delete mode 100644 test/language/reserved-words/7.6.1-7-5.js
 delete mode 100644 test/language/reserved-words/7.6.1-7-6.js
 delete mode 100644 test/language/reserved-words/7.6.1-7-7.js
 delete mode 100644 test/language/reserved-words/7.6.1-7-8.js
 delete mode 100644 test/language/reserved-words/7.6.1-7-9.js
 delete mode 100644 test/language/reserved-words/7.6.1-8-1.js
 delete mode 100644 test/language/reserved-words/7.6.1-8-10.js
 delete mode 100644 test/language/reserved-words/7.6.1-8-11.js
 delete mode 100644 test/language/reserved-words/7.6.1-8-12.js
 delete mode 100644 test/language/reserved-words/7.6.1-8-13.js
 delete mode 100644 test/language/reserved-words/7.6.1-8-14.js
 delete mode 100644 test/language/reserved-words/7.6.1-8-15.js
 delete mode 100644 test/language/reserved-words/7.6.1-8-16.js
 delete mode 100644 test/language/reserved-words/7.6.1-8-2.js
 delete mode 100644 test/language/reserved-words/7.6.1-8-3.js
 delete mode 100644 test/language/reserved-words/7.6.1-8-4.js
 delete mode 100644 test/language/reserved-words/7.6.1-8-5.js
 delete mode 100644 test/language/reserved-words/7.6.1-8-6.js
 delete mode 100644 test/language/reserved-words/7.6.1-8-7.js
 delete mode 100644 test/language/reserved-words/7.6.1-8-8.js
 delete mode 100644 test/language/reserved-words/7.6.1-8-9.js
 delete mode 100644 test/language/reserved-words/7.6.1.2-1gs.js
 delete mode 100644 test/language/reserved-words/S7.6.1_A1.1.js
 delete mode 100644 test/language/reserved-words/S7.6.1_A1.2.js
 delete mode 100644 test/language/reserved-words/S7.6.1_A1.3.js
 create mode 100644 test/language/reserved-words/ident-name-global-property-accessor.js
 create mode 100644 test/language/reserved-words/ident-name-global-property-memberexpr-str.js
 create mode 100644 test/language/reserved-words/ident-name-global-property-memberexpr.js
 create mode 100644 test/language/reserved-words/ident-name-global-property-prop-name.js
 create mode 100644 test/language/reserved-words/ident-name-keyword-accessor.js
 create mode 100644 test/language/reserved-words/ident-name-keyword-memberexpr-str.js
 create mode 100644 test/language/reserved-words/ident-name-keyword-memberexpr.js
 create mode 100644 test/language/reserved-words/ident-name-keyword-prop-name.js
 create mode 100644 test/language/reserved-words/ident-name-reserved-word-literal-accessor.js
 create mode 100644 test/language/reserved-words/ident-name-reserved-word-literal-memberexpr-str.js
 create mode 100644 test/language/reserved-words/ident-name-reserved-word-literal-memberexpr.js
 create mode 100644 test/language/reserved-words/ident-name-reserved-word-literal-prop-name.js
 create mode 100644 test/language/reserved-words/ident-reference-false-escaped.js
 create mode 100644 test/language/reserved-words/ident-reference-false.js
 create mode 100644 test/language/reserved-words/ident-reference-null-escaped.js
 create mode 100644 test/language/reserved-words/ident-reference-null.js
 create mode 100644 test/language/reserved-words/ident-reference-true-escaped.js
 create mode 100644 test/language/reserved-words/ident-reference-true.js
 create mode 100644 test/language/reserved-words/label-ident-false-escaped.js
 create mode 100644 test/language/reserved-words/label-ident-false.js
 create mode 100644 test/language/reserved-words/label-ident-null-escaped.js
 create mode 100644 test/language/reserved-words/label-ident-null.js
 create mode 100644 test/language/reserved-words/label-ident-true-escaped.js
 create mode 100644 test/language/reserved-words/label-ident-true.js
 rename test/language/reserved-words/{S7.6.1_A2.js => unreserved-words.js} (100%)

diff --git a/test/language/reserved-words/7.6.1-1-1.js b/test/language/reserved-words/7.6.1-1-1.js
deleted file mode 100644
index e266859f05..0000000000
--- a/test/language/reserved-words/7.6.1-1-1.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-1-1
-description: >
-    Allow reserved words as property names at object initialization,
-    verified with hasOwnProperty: null, true, false
----*/
-
-        var tokenCodes  = { 
-            null: 0,
-            true: 1,
-            false: 2
-        };
-        var arr = [
-            'null',
-            'true',
-            'false'
-        ];        
-        for(var p in tokenCodes) {
-            for(var p1 in arr) {
-                if(arr[p1] === p) {                     
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-1-10.js b/test/language/reserved-words/7.6.1-1-10.js
deleted file mode 100644
index dc8c5a3390..0000000000
--- a/test/language/reserved-words/7.6.1-1-10.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-1-10
-description: >
-    Allow reserved words as property names at object initialization,
-    verified with hasOwnProperty: in, try, class
----*/
-
-        var tokenCodes  = { 
-            in: 0, 
-            try: 1,
-            class: 2
-        };
-        var arr = [
-            'in', 
-            'try',
-            'class'
-        ];        
-        for(var p in tokenCodes) {
-            for(var p1 in arr) {
-                if(arr[p1] === p) {                     
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-1-11.js b/test/language/reserved-words/7.6.1-1-11.js
deleted file mode 100644
index b0028f79dd..0000000000
--- a/test/language/reserved-words/7.6.1-1-11.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-1-11
-description: >
-    Allow reserved words as property names at object initialization,
-    verified with hasOwnProperty: enum, extends, super
----*/
-
-        var tokenCodes  = { 
-            enum: 0,
-            extends: 1,
-            super: 2
-        };
-        var arr = [
-            'enum',
-            'extends',
-            'super'
-        ];        
-        for(var p in tokenCodes) {
-            for(var p1 in arr) {
-                if(arr[p1] === p) {                     
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-1-12.js b/test/language/reserved-words/7.6.1-1-12.js
deleted file mode 100644
index 68d419c2c2..0000000000
--- a/test/language/reserved-words/7.6.1-1-12.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-1-12
-description: >
-    Allow reserved words as property names at object initialization,
-    verified with hasOwnProperty: const, export, import
----*/
-
-        var tokenCodes  = { 
-            const: 0,
-            export: 1,
-            import: 2
-        };
-        var arr = [
-            'const',
-            'export',
-            'import'
-        ];        
-        for(var p in tokenCodes) {
-            for(var p1 in arr) {
-                if(arr[p1] === p) {                     
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-1-13.js b/test/language/reserved-words/7.6.1-1-13.js
deleted file mode 100644
index 4aa5743784..0000000000
--- a/test/language/reserved-words/7.6.1-1-13.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-1-13
-description: >
-    Allow reserved words as property names at object initialization,
-    verified with hasOwnProperty: implements, let, private
----*/
-
-        var tokenCodes  = { 
-            implements: 0,
-            let: 1,
-            private: 2
-        };
-        var arr = [
-            'implements',
-            'let',
-            'private'
-        ];        
-        for(var p in tokenCodes) {
-            for(var p1 in arr) {
-                if(arr[p1] === p) {                     
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-1-14.js b/test/language/reserved-words/7.6.1-1-14.js
deleted file mode 100644
index 541dd17505..0000000000
--- a/test/language/reserved-words/7.6.1-1-14.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-1-14
-description: >
-    Allow reserved words as property names at object initialization,
-    verified with hasOwnProperty: public, yield, interface
----*/
-
-        var tokenCodes  = { 
-            public: 0,
-            yield: 1,
-            interface: 2
-        };
-        var arr = [
-            'public',
-            'yield',
-            'interface'
-        ];        
-        for(var p in tokenCodes) {
-            for(var p1 in arr) {
-                if(arr[p1] === p) {                     
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-1-15.js b/test/language/reserved-words/7.6.1-1-15.js
deleted file mode 100644
index aa3bc86d0f..0000000000
--- a/test/language/reserved-words/7.6.1-1-15.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-1-15
-description: >
-    Allow reserved words as property names at object initialization,
-    verified with hasOwnProperty: package, protected, static
----*/
-
-        var tokenCodes  = { 
-            package: 0,
-            protected: 1,
-            static: 2
-        };
-        var arr = [
-            'package',
-            'protected',
-            'static'
-        ];        
-        for(var p in tokenCodes) {
-            for(var p1 in arr) {
-                if(arr[p1] === p) {                     
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-1-16.js b/test/language/reserved-words/7.6.1-1-16.js
deleted file mode 100644
index cfe3b123e5..0000000000
--- a/test/language/reserved-words/7.6.1-1-16.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-1-16
-description: >
-    Allow reserved words as property names at object initialization,
-    verified with hasOwnProperty: undeefined, NaN, Infinity
----*/
-
-        var tokenCodes  = { 
-            undefined: 0,
-            NaN: 1,
-            Infinity: 2
-        };
-        var arr = [
-            'undefined',
-            'NaN',
-            'Infinity'
-        ];        
-        for(var p in tokenCodes) {
-            for(var p1 in arr) {
-                if(arr[p1] === p) {                     
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-1-2.js b/test/language/reserved-words/7.6.1-1-2.js
deleted file mode 100644
index 67fdd5b4cc..0000000000
--- a/test/language/reserved-words/7.6.1-1-2.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-1-2
-description: >
-    Allow reserved words as property names at object initialization,
-    verified with hasOwnProperty: break, case, do
----*/
-
-        var tokenCodes  = { 
-            break: 0,
-            case: 1,
-            do: 2
-        };
-        var arr = [
-            'break',
-            'case',
-            'do'
-        ];        
-        for(var p in tokenCodes) {
-            for(var p1 in arr) {
-                if(arr[p1] === p) {                     
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-1-3.js b/test/language/reserved-words/7.6.1-1-3.js
deleted file mode 100644
index 8c0ccf9fea..0000000000
--- a/test/language/reserved-words/7.6.1-1-3.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-1-3
-description: >
-    Allow reserved words as property names at object initialization,
-    verified with hasOwnProperty: instanceof, typeof, else
----*/
-
-        var tokenCodes  = { 
-            instanceof: 0,
-            typeof: 1,
-            else: 2
-        };
-        var arr = [
-            'instanceof',
-            'typeof',
-            'else'
-        ];        
-        for(var p in tokenCodes) {
-            for(var p1 in arr) {
-                if(arr[p1] === p) {                     
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-1-4.js b/test/language/reserved-words/7.6.1-1-4.js
deleted file mode 100644
index 47758acc56..0000000000
--- a/test/language/reserved-words/7.6.1-1-4.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-1-4
-description: >
-    Allow reserved words as property names at object initialization,
-    verified with hasOwnProperty: new, var, catch
----*/
-
-        var tokenCodes  = { 
-            new: 0,
-            var: 1,
-            catch: 2
-        };
-        var arr = [
-            'new', 
-            'var', 
-            'catch'
-        ];        
-        for(var p in tokenCodes) {
-            for(var p1 in arr) {
-                if(arr[p1] === p) {                     
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-1-5.js b/test/language/reserved-words/7.6.1-1-5.js
deleted file mode 100644
index dcb93a8564..0000000000
--- a/test/language/reserved-words/7.6.1-1-5.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-1-5
-description: >
-    Allow reserved words as property names at object initialization,
-    verified with hasOwnProperty: finally, return, void
----*/
-
-        var tokenCodes  = { 
-            finally: 0,
-            return: 1,
-            void: 2
-        };
-        var arr = [ 
-            'finally', 
-            'return', 
-            'void'
-        ];        
-        for(var p in tokenCodes) {
-            for(var p1 in arr) {
-                if(arr[p1] === p) {                     
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-1-6.js b/test/language/reserved-words/7.6.1-1-6.js
deleted file mode 100644
index 31146148d3..0000000000
--- a/test/language/reserved-words/7.6.1-1-6.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-1-6
-description: >
-    Allow reserved words as property names at object initialization,
-    verified with hasOwnProperty: continue, for, switch
----*/
-
-        var tokenCodes  = { 
-            continue: 0, 
-            for: 1, 
-            switch: 2
-        };
-        var arr = [
-            'continue', 
-            'for',
-            'switch'
-        ];        
-        for(var p in tokenCodes) {
-            for(var p1 in arr) {
-                if(arr[p1] === p) {                     
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-1-7.js b/test/language/reserved-words/7.6.1-1-7.js
deleted file mode 100644
index 4fd122a3b4..0000000000
--- a/test/language/reserved-words/7.6.1-1-7.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-1-7
-description: >
-    Allow reserved words as property names at object initialization,
-    verified with hasOwnProperty: while, debugger, function
----*/
-
-        var tokenCodes  = { 
-            while: 0, 
-            debugger: 1, 
-            function: 2
-        };
-        var arr = [ 
-            'while' ,
-            'debugger', 
-            'function'
-        ];        
-        for(var p in tokenCodes) {
-            for(var p1 in arr) {
-                if(arr[p1] === p) {                     
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-1-8.js b/test/language/reserved-words/7.6.1-1-8.js
deleted file mode 100644
index 2a2adad579..0000000000
--- a/test/language/reserved-words/7.6.1-1-8.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-1-8
-description: >
-    Allow reserved words as property names at object initialization,
-    verified with hasOwnProperty: this, with, default
----*/
-
-        var tokenCodes  = {       
-            this: 0,  
-            with: 1, 
-            default: 2
-        };
-        var arr = [ 
-            'this', 
-            'with', 
-            'default'
-        ];        
-        for(var p in tokenCodes) {
-            for(var p1 in arr) {
-                if(arr[p1] === p) {                     
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-1-9.js b/test/language/reserved-words/7.6.1-1-9.js
deleted file mode 100644
index ce170fd135..0000000000
--- a/test/language/reserved-words/7.6.1-1-9.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-1-9
-description: >
-    Allow reserved words as property names at object initialization,
-    verified with hasOwnProperty: if, throw, delete
----*/
-
-        var tokenCodes  = { 
-            if: 0, 
-            throw: 1, 
-            delete: 2
-        };
-        var arr = [
-            'if', 
-            'throw', 
-            'delete'
-        ];        
-        for(var p in tokenCodes) {
-            for(var p1 in arr) {
-                if(arr[p1] === p) {                     
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-2-1.js b/test/language/reserved-words/7.6.1-2-1.js
deleted file mode 100644
index b7da94dad8..0000000000
--- a/test/language/reserved-words/7.6.1-2-1.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-2-1
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    verified with hasOwnProperty: null, true, false
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.null = 0;
-	    tokenCodes.true = 1;
-	    tokenCodes.false = 2;
-        var arr = [
-            'null',
-            'true',
-            'false'
-        ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-2-10.js b/test/language/reserved-words/7.6.1-2-10.js
deleted file mode 100644
index 8fccd0e4be..0000000000
--- a/test/language/reserved-words/7.6.1-2-10.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-2-10
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    verified with hasOwnProperty: in, try, class
----*/
-
-        var tokenCodes = {};
-        tokenCodes.in = 0;
-        tokenCodes.try = 1;
-        tokenCodes.class = 2;
-        var arr = [
-            'in', 
-            'try',
-            'class'
-        ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-2-11.js b/test/language/reserved-words/7.6.1-2-11.js
deleted file mode 100644
index 89ce1886f0..0000000000
--- a/test/language/reserved-words/7.6.1-2-11.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-2-11
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    verified with hasOwnProperty: enum, extends, super
----*/
-
-        var tokenCodes = {};
-        tokenCodes.enum = 0;
-        tokenCodes.extends = 1;
-        tokenCodes.super = 2;
-        var arr = [
-            'enum',
-            'extends',
-            'super'
-        ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-2-12.js b/test/language/reserved-words/7.6.1-2-12.js
deleted file mode 100644
index 51aac3fd46..0000000000
--- a/test/language/reserved-words/7.6.1-2-12.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-2-12
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    verified with hasOwnProperty: const, export, import
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.const = 0;
-        tokenCodes.export = 1;
-        tokenCodes.import = 2;
-        var arr = [
-            'const',
-            'export',
-            'import'
-        ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-2-13.js b/test/language/reserved-words/7.6.1-2-13.js
deleted file mode 100644
index e2778ed0fb..0000000000
--- a/test/language/reserved-words/7.6.1-2-13.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-2-13
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    verified with hasOwnProperty: implements, let, private
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.implements = 0;
-        tokenCodes.let = 1;
-        tokenCodes.private = 2;
-        var arr = [
-            'implements',
-            'let',
-            'private'
-        ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-2-14.js b/test/language/reserved-words/7.6.1-2-14.js
deleted file mode 100644
index 8146cd25fd..0000000000
--- a/test/language/reserved-words/7.6.1-2-14.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-2-14
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    verified with hasOwnProperty: public, yield, interface
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.public = 0;
-        tokenCodes.yield = 1;
-        tokenCodes.interface = 2;
-        var arr = [
-            'public',
-            'yield',
-            'interface'
-        ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-2-15.js b/test/language/reserved-words/7.6.1-2-15.js
deleted file mode 100644
index cb5be454b4..0000000000
--- a/test/language/reserved-words/7.6.1-2-15.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-2-15
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    verified with hasOwnProperty: package, protected, static
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.package = 0;
-        tokenCodes.protected = 1;
-        tokenCodes.static = 2;
-        var arr = [
-            'package',
-            'protected',
-            'static'    
-        ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-2-16.js b/test/language/reserved-words/7.6.1-2-16.js
deleted file mode 100644
index 4c22b3dc63..0000000000
--- a/test/language/reserved-words/7.6.1-2-16.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-2-16
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    verified with hasOwnProperty: undefined, NaN, Infinity
----*/
-
-        var tokenCodes = {};
-        tokenCodes.undefined = 0;
-        tokenCodes.NaN = 1;
-        tokenCodes.Infinity = 2;
-        var arr = [
-            'undefined',
-            'NaN',
-            'Infinity'
-        ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-2-2.js b/test/language/reserved-words/7.6.1-2-2.js
deleted file mode 100644
index d95aeb71f2..0000000000
--- a/test/language/reserved-words/7.6.1-2-2.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-2-2
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    verified with hasOwnProperty: break, case, do
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.break = 0;  	
-        tokenCodes.case = 1;
-        tokenCodes.do = 2;
-        var arr = [
-            'break',
-            'case',
-            'do'
-        ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-2-3.js b/test/language/reserved-words/7.6.1-2-3.js
deleted file mode 100644
index 1d3374dc08..0000000000
--- a/test/language/reserved-words/7.6.1-2-3.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-2-3
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    verified with hasOwnProperty: instanceof, typeof, else
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.instanceof = 0;
-        tokenCodes.typeof = 1;
-        tokenCodes.else = 2;
-        var arr = [
-            'instanceof',
-            'typeof',
-            'else'
-        ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-2-4.js b/test/language/reserved-words/7.6.1-2-4.js
deleted file mode 100644
index d4b3ad549a..0000000000
--- a/test/language/reserved-words/7.6.1-2-4.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-2-4
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    verified with hasOwnProperty: new, var, catch
----*/
-
-        var tokenCodes = {};
-        tokenCodes.new = 0;
-        tokenCodes.var = 1;
-        tokenCodes.catch = 2;
-        var arr = [
-            'new', 
-            'var', 
-            'catch'
-        ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-2-5.js b/test/language/reserved-words/7.6.1-2-5.js
deleted file mode 100644
index fb1cda05c6..0000000000
--- a/test/language/reserved-words/7.6.1-2-5.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-2-5
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    verified with hasOwnProperty: finally, return, void
----*/
-
-        var tokenCodes = {};
-        tokenCodes.finally = 0;
-        tokenCodes.return = 1;
-        tokenCodes.void = 2;
-        var arr = [
-            'finally', 
-            'return', 
-            'void'
-        ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-2-6.js b/test/language/reserved-words/7.6.1-2-6.js
deleted file mode 100644
index a506cc0eaf..0000000000
--- a/test/language/reserved-words/7.6.1-2-6.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-2-6
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    verified with hasOwnProperty: continue, for, switch
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.continue = 0;
-        tokenCodes.for = 1; 
-        tokenCodes.switch = 2;
-        var arr = [
-            'continue', 
-            'for',
-            'switch'
-        ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-2-7.js b/test/language/reserved-words/7.6.1-2-7.js
deleted file mode 100644
index 8d9991db61..0000000000
--- a/test/language/reserved-words/7.6.1-2-7.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-2-7
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    verified with hasOwnProperty: while, debugger, function
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.while = 0; 
-        tokenCodes.debugger = 1;
-        tokenCodes.function = 2; 
-        var arr = [
-            'while' ,
-            'debugger', 
-            'function'
-        ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-2-8.js b/test/language/reserved-words/7.6.1-2-8.js
deleted file mode 100644
index dcfb2edbbd..0000000000
--- a/test/language/reserved-words/7.6.1-2-8.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-2-8
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    verified with hasOwnProperty: this, with, default
----*/
-
-        var tokenCodes = {};
-        tokenCodes.this = 0; 
-        tokenCodes.with = 1; 
-        tokenCodes.default = 2;
-        var arr = [
-            'this', 
-            'with', 
-            'default'
-        ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-2-9.js b/test/language/reserved-words/7.6.1-2-9.js
deleted file mode 100644
index 672dd151d5..0000000000
--- a/test/language/reserved-words/7.6.1-2-9.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-2-9
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    verified with hasOwnProperty: if, throw, delete
----*/
-
-        var tokenCodes = {};
-        tokenCodes.if = 0;
-        tokenCodes.throw = 1;
-        tokenCodes.delete = 2;
-        var arr = [
-            'if', 
-            'throw', 
-            'delete'
-        ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-3-1.js b/test/language/reserved-words/7.6.1-3-1.js
deleted file mode 100644
index b4fe62f18b..0000000000
--- a/test/language/reserved-words/7.6.1-3-1.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-3-1
-description: >
-    Allow reserved words as property names by index
-    assignment,verified with hasOwnProperty: null, true, false
----*/
-
-        var tokenCodes  = {};
-        tokenCodes['null'] = 0;
-	    tokenCodes['true'] = 1;
-	    tokenCodes['false'] = 2;
-        var arr = [
-            'null',
-            'true',
-            'false'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-3-10.js b/test/language/reserved-words/7.6.1-3-10.js
deleted file mode 100644
index fc3cfdaf0b..0000000000
--- a/test/language/reserved-words/7.6.1-3-10.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-3-10
-description: >
-    Allow reserved words as property names by index
-    assignment,verified with hasOwnProperty: in, try, class
----*/
-
-        var tokenCodes  = {};
-        tokenCodes['in'] = 0;
-        tokenCodes['try'] = 1;
-        tokenCodes['class'] = 2;
-        var arr = [
-            'in',
-            'try',
-            'class'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-3-11.js b/test/language/reserved-words/7.6.1-3-11.js
deleted file mode 100644
index 11760acac2..0000000000
--- a/test/language/reserved-words/7.6.1-3-11.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-3-11
-description: >
-    Allow reserved words as property names by index
-    assignment,verified with hasOwnProperty: enum, extends, super
----*/
-
-        var tokenCodes  = {};
-        tokenCodes['enum'] = 0;
-        tokenCodes['extends'] = 1;
-        tokenCodes['super'] = 2;
-        var arr = [
-            'enum',
-            'extends',
-            'super'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-3-12.js b/test/language/reserved-words/7.6.1-3-12.js
deleted file mode 100644
index 6ac38776a2..0000000000
--- a/test/language/reserved-words/7.6.1-3-12.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-3-12
-description: >
-    Allow reserved words as property names by index
-    assignment,verified with hasOwnProperty: const, export, import
----*/
-
-        var tokenCodes  = {};
-        tokenCodes['const'] = 0;
-        tokenCodes['export'] = 1;
-        tokenCodes['import'] = 2;
-        var arr = [
-            'const',
-            'export',
-            'import'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-3-13.js b/test/language/reserved-words/7.6.1-3-13.js
deleted file mode 100644
index 30295413ac..0000000000
--- a/test/language/reserved-words/7.6.1-3-13.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-3-13
-description: >
-    Allow reserved words as property names by index
-    assignment,verified with hasOwnProperty: implements, let, private
----*/
-
-        var tokenCodes  = {};
-        tokenCodes['implements'] = 0;
-        tokenCodes['let'] = 1;
-        tokenCodes['private'] = 2;
-        var arr = [
-            'implements',
-            'let',
-            'private'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-3-14.js b/test/language/reserved-words/7.6.1-3-14.js
deleted file mode 100644
index 5ecf63f102..0000000000
--- a/test/language/reserved-words/7.6.1-3-14.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-3-14
-description: >
-    Allow reserved words as property names by index
-    assignment,verified with hasOwnProperty: public, yield, interface
----*/
-
-        var tokenCodes  = {};
-        tokenCodes['public'] = 0;
-        tokenCodes['yield'] = 1;
-        tokenCodes['interface'] = 2;
-        var arr = [
-            'public',
-            'yield',
-            'interface'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-3-15.js b/test/language/reserved-words/7.6.1-3-15.js
deleted file mode 100644
index 30b8cbe1c2..0000000000
--- a/test/language/reserved-words/7.6.1-3-15.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-3-15
-description: >
-    Allow reserved words as property names by index
-    assignment,verified with hasOwnProperty: package, protected, static
----*/
-
-        var tokenCodes  = {};
-        tokenCodes['package'] = 0;
-        tokenCodes['protected'] = 1;
-        tokenCodes['static'] = 2;
-        var arr = [
-            'package',
-            'protected',
-            'static'   
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-3-16.js b/test/language/reserved-words/7.6.1-3-16.js
deleted file mode 100644
index cade684d40..0000000000
--- a/test/language/reserved-words/7.6.1-3-16.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-3-16
-description: >
-    Allow reserved words as property names by index
-    assignment,verified with hasOwnProperty: undefined, NaN, Infinity
----*/
-
-        var tokenCodes  = {};
-        tokenCodes['undefined'] = 0;
-        tokenCodes['NaN'] = 1;
-        tokenCodes['Infinity'] = 2;
-        var arr = [
-            'undefined',
-            'NaN',
-            'Infinity'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-3-2.js b/test/language/reserved-words/7.6.1-3-2.js
deleted file mode 100644
index 966beaed8e..0000000000
--- a/test/language/reserved-words/7.6.1-3-2.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-3-2
-description: >
-    Allow reserved words as property names by index
-    assignment,verified with hasOwnProperty: break, case, do
----*/
-
-        var tokenCodes  = {};
-        tokenCodes['break'] = 0;
-        tokenCodes['case'] = 1;
-        tokenCodes['do'] = 2;
-        var arr = [
-            'break',
-            'case',
-            'do'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-3-3.js b/test/language/reserved-words/7.6.1-3-3.js
deleted file mode 100644
index 65969a5512..0000000000
--- a/test/language/reserved-words/7.6.1-3-3.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-3-3
-description: >
-    Allow reserved words as property names by index
-    assignment,verified with hasOwnProperty: instanceof, typeof, else
----*/
-
-        var tokenCodes  = {};
-        tokenCodes['instanceof'] = 0;
-        tokenCodes['typeof'] = 1;
-        tokenCodes['else'] = 2;
-        var arr = [
-            'instanceof',
-            'typeof',
-            'else'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-3-4.js b/test/language/reserved-words/7.6.1-3-4.js
deleted file mode 100644
index 709f50c81f..0000000000
--- a/test/language/reserved-words/7.6.1-3-4.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-3-4
-description: >
-    Allow reserved words as property names by index
-    assignment,verified with hasOwnProperty: new, var, catch
----*/
-
-        var tokenCodes  = {};
-        tokenCodes['new'] = 0;
-        tokenCodes['var'] = 1;
-        tokenCodes['catch'] = 2;
-        var arr = [
-            'new',
-            'var',
-            'catch'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-3-5.js b/test/language/reserved-words/7.6.1-3-5.js
deleted file mode 100644
index a19b8e05ca..0000000000
--- a/test/language/reserved-words/7.6.1-3-5.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-3-5
-description: >
-    Allow reserved words as property names by index
-    assignment,verified with hasOwnProperty: finally, return, void
----*/
-
-        var tokenCodes  = {};
-        tokenCodes['finally'] = 0;
-        tokenCodes['return'] = 1;
-        tokenCodes['void'] = 2;
-        var arr = [
-            'finally',
-            'return',
-            'void'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-3-6.js b/test/language/reserved-words/7.6.1-3-6.js
deleted file mode 100644
index c37dd1089c..0000000000
--- a/test/language/reserved-words/7.6.1-3-6.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-3-6
-description: >
-    Allow reserved words as property names by index
-    assignment,verified with hasOwnProperty: continue, for, switch
----*/
-
-        var tokenCodes  = {};
-        tokenCodes['continue'] = 0;
-        tokenCodes['for'] = 1;
-        tokenCodes['switch'] = 2;
-        var arr = [
-            'continue',
-            'for',
-            'switch'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-3-7.js b/test/language/reserved-words/7.6.1-3-7.js
deleted file mode 100644
index 0d3a7f639b..0000000000
--- a/test/language/reserved-words/7.6.1-3-7.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-3-7
-description: >
-    Allow reserved words as property names by index
-    assignment,verified with hasOwnProperty: while, debugger, function
----*/
-
-        var tokenCodes  = {};
-        tokenCodes['while'] = 0;
-        tokenCodes['debugger'] = 1;
-        tokenCodes['function'] = 2; 
-        var arr = [
-            'while',
-            'debugger',
-            'function'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-3-8.js b/test/language/reserved-words/7.6.1-3-8.js
deleted file mode 100644
index e0a49e2f54..0000000000
--- a/test/language/reserved-words/7.6.1-3-8.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-3-8
-description: >
-    Allow reserved words as property names by index
-    assignment,verified with hasOwnProperty: this, with, default
----*/
-
-        var tokenCodes  = {};
-        tokenCodes['this'] = 0;
-        tokenCodes['with'] = 1;
-        tokenCodes['default'] = 2;
-        var arr = [
-            'this',
-            'with',
-            'default'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-3-9.js b/test/language/reserved-words/7.6.1-3-9.js
deleted file mode 100644
index 5dea91a629..0000000000
--- a/test/language/reserved-words/7.6.1-3-9.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-3-9
-description: >
-    Allow reserved words as property names by index
-    assignment,verified with hasOwnProperty: if, throw, delete
----*/
-
-        var tokenCodes  = {};
-        tokenCodes['if'] = 0;
-        tokenCodes['throw'] = 1;
-        tokenCodes['delete'] = 2;
-        var arr = [
-            'if',
-            'throw',
-            'delete'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-4-1.js b/test/language/reserved-words/7.6.1-4-1.js
deleted file mode 100644
index 4a7a6ae921..0000000000
--- a/test/language/reserved-words/7.6.1-4-1.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-4-1
-description: >
-    Allow reserved words as property names by set function within an
-    object, verified with hasOwnProperty: null, true, false
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set null(value) {
-                test0 = value;        
-            },
-            get null() {
-                return test0;
-            },
-            set true(value) {
-                test1 = value;        
-            },
-            get true() {
-                return test1;
-            },
-            set false(value) {
-                test2 = value;        
-            },
-            get false(){
-                return test2;
-            }
-        };      
-        var arr = [
-            'null',
-            'true',
-            'false'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-4-10.js b/test/language/reserved-words/7.6.1-4-10.js
deleted file mode 100644
index 29a0c5fd46..0000000000
--- a/test/language/reserved-words/7.6.1-4-10.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-4-10
-description: >
-    Allow reserved words as property names by set function within an
-    object, verified with hasOwnProperty: in, try, class
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set in(value){
-                test0 = value;
-            },
-            get in(){
-                return test0;
-            },
-            set try(value){
-                test1 = value;
-            },
-            get try(){
-                return test1
-            },
-            set class(value){
-                test2 = value;
-            },
-            get class(){
-                return test2;
-            }
-        };      
-        var arr = [
-            'in', 
-            'try',
-            'class'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-4-11.js b/test/language/reserved-words/7.6.1-4-11.js
deleted file mode 100644
index 7e875e1b68..0000000000
--- a/test/language/reserved-words/7.6.1-4-11.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-4-11
-description: >
-    Allow reserved words as property names by set function within an
-    object, verified with hasOwnProperty: enum, extends, super
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set enum(value){
-                test0 = value;
-            },
-            get enum(){
-                return test0;
-            },
-            set extends(value){
-                test1 = value;
-            },
-            get extends(){
-                return test1;
-            },
-            set super(value){
-                test2 = value;
-            }, 
-            get super(){
-                return test2;
-            }
-        };      
-        var arr = [
-            'enum',
-            'extends',
-            'super'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-4-12.js b/test/language/reserved-words/7.6.1-4-12.js
deleted file mode 100644
index 051b2a8a7e..0000000000
--- a/test/language/reserved-words/7.6.1-4-12.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-4-12
-description: >
-    Allow reserved words as property names by set function within an
-    object, verified with hasOwnProperty: const, export, import
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set const(value){
-                test0 = value;
-            },
-            get const(){
-                return test0;
-            },
-            set export(value){
-                test1 = value;
-            },
-            get export(){
-                return test1
-            },
-            set import(value){
-                test2 = value;
-            },
-            get import(){
-                return test2
-            }
-        };      
-        var arr = [
-            'const',
-            'export',
-            'import'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-4-13.js b/test/language/reserved-words/7.6.1-4-13.js
deleted file mode 100644
index 69a79f9ae3..0000000000
--- a/test/language/reserved-words/7.6.1-4-13.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-4-13
-description: >
-    Allow reserved words as property names by set function within an
-    object, verified with hasOwnProperty: implements, let, private
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set implements(value){
-                test0 = value;
-            },
-            get implements(){
-                return test0;
-            },
-            set let(value){
-                test1 = value;
-            },
-            get let(){
-                return test1
-            },
-            set private(value){
-                test2 = value;
-            },
-            get private(){
-                return test2;
-            }
-        };      
-        var arr = [
-            'implements',
-            'let',
-            'private'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-4-14.js b/test/language/reserved-words/7.6.1-4-14.js
deleted file mode 100644
index 152021a1bc..0000000000
--- a/test/language/reserved-words/7.6.1-4-14.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-4-14
-description: >
-    Allow reserved words as property names by set function within an
-    object, verified with hasOwnProperty: public, yield, interface
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set public(value){
-                test0 = value;
-            },
-            get public(){
-                return test0;
-            },
-            set yield(value){
-                test1 = value;
-            },
-            get yield(){
-                return test1;
-            },
-            set interface(value){
-                test2 = value;
-            },
-            get interface(){
-                return test2;
-            }
-        };      
-        var arr = [
-            'public',
-            'yield',
-            'interface'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-4-15.js b/test/language/reserved-words/7.6.1-4-15.js
deleted file mode 100644
index 8e25906549..0000000000
--- a/test/language/reserved-words/7.6.1-4-15.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-4-15
-description: >
-    Allow reserved words as property names by set function within an
-    object, verified with hasOwnProperty: package, protected, static
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set package(value){
-                test0 = value;
-            },
-            get package(){
-                return test0;
-            },
-            set protected(value){
-                test1 = value;
-            },
-            get protected(){
-                return test1
-            },
-            set static(value){
-                test2 = value;
-            },
-            get static(){
-                return test2;
-            }
-        };      
-        var arr = [
-            'package',
-            'protected',
-            'static'  
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-4-16.js b/test/language/reserved-words/7.6.1-4-16.js
deleted file mode 100644
index f7c3800b59..0000000000
--- a/test/language/reserved-words/7.6.1-4-16.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-4-16
-description: >
-    Allow reserved words as property names by set function within an
-    object, verified with hasOwnProperty: undefined, NaN, Infinity
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set undefined(value){
-                test0 = value;
-            },
-            get undefined(){
-                return test0;
-            },
-            set NaN(value){
-                test1 = value;
-            },
-            get NaN(){
-                return test1;
-            },
-            set Infinity(value){
-                test2 = value;
-            },
-            get Infinity(){
-                return test2;
-            }
-        };      
-        var arr = [
-            'undefined',
-            'NaN',
-            'Infinity'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-4-2.js b/test/language/reserved-words/7.6.1-4-2.js
deleted file mode 100644
index 73ab9e8f89..0000000000
--- a/test/language/reserved-words/7.6.1-4-2.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-4-2
-description: >
-    Allow reserved words as property names by set function within an
-    object, verified with hasOwnProperty: break, case, do
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set break(value){
-                test0 = value;        
-            },
-            get break(){
-                return test0;
-            },
-            set case(value){
-                test1 = value;
-            },
-            get case(){
-                return test1;
-            },
-            set do(value){
-                test2 = value;
-            },
-            get do(){
-                return test2;
-            }
-        };      
-        var arr = [
-            'break',
-            'case',
-            'do'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-4-3.js b/test/language/reserved-words/7.6.1-4-3.js
deleted file mode 100644
index 99684a6c6a..0000000000
--- a/test/language/reserved-words/7.6.1-4-3.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-4-3
-description: >
-    Allow reserved words as property names by set function within an
-    object, verified with hasOwnProperty: instanceof, typeof, else
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set instanceof(value){
-                test0 = value;
-            },
-            get instanceof(){
-                return test0;
-            },
-            set typeof(value){
-                test1 = value;
-            },
-            get typeof(){
-                return test1;
-            },
-            set else(value){
-                test2 = value;
-            },
-            get else(){
-                return test2;
-            }
-        };      
-        var arr = [
-            'instanceof',
-            'typeof',
-            'else'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-4-4.js b/test/language/reserved-words/7.6.1-4-4.js
deleted file mode 100644
index a7c3144080..0000000000
--- a/test/language/reserved-words/7.6.1-4-4.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-4-4
-description: >
-    Allow reserved words as property names by set function within an
-    object, verified with hasOwnProperty: new, var, catch
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set new(value){
-                test0 = value;
-            },
-            get new(){
-                return test0;
-            },
-            set var(value){
-                test1 = value;
-            },
-            get var(){
-                return test1;
-            },
-            set catch(value){
-                test2 = value;
-            },
-            get catch(){
-                return test2;
-            }
-        };      
-        var arr = [
-            'new', 
-            'var', 
-            'catch'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-4-5.js b/test/language/reserved-words/7.6.1-4-5.js
deleted file mode 100644
index df01004fdd..0000000000
--- a/test/language/reserved-words/7.6.1-4-5.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-4-5
-description: >
-    Allow reserved words as property names by set function within an
-    object, verified with hasOwnProperty: finally, return, void
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set finally(value){
-                test0 = value;
-            },
-            get finally(){
-                return test0;
-            },
-            set return(value){
-                test1 = value;
-            },
-            get return(){
-                return test1;
-            },
-            set void(value){
-                test2 = value;
-            },
-            get void(){
-                return test2;
-            }
-        };      
-        var arr = [
-            'finally', 
-            'return', 
-            'void'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-4-6.js b/test/language/reserved-words/7.6.1-4-6.js
deleted file mode 100644
index fbd5e27765..0000000000
--- a/test/language/reserved-words/7.6.1-4-6.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-4-6
-description: >
-    Allow reserved words as property names by set function within an
-    object, verified with hasOwnProperty: continue, for, switch
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set continue(value){
-                test0 = value;
-            },
-            get continue(){
-                return test0;
-            },
-            set for(value){
-                test1 = value;
-            },
-            get for(){
-                return test1;
-            },
-            set switch(value){
-                test2 = value;
-            },
-            get switch(){
-                return test2;
-            }
-        };      
-        var arr = [
-            'continue', 
-            'for',
-            'switch'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-4-7.js b/test/language/reserved-words/7.6.1-4-7.js
deleted file mode 100644
index 7f5a957f9e..0000000000
--- a/test/language/reserved-words/7.6.1-4-7.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-4-7
-description: >
-    Allow reserved words as property names by set function within an
-    object, verified with hasOwnProperty: while, debugger, function
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set while(value){
-                test0 = value;
-            },
-            get while(){
-                return test0
-            },
-            set debugger(value){
-                test1 = value;
-            },
-            get debugger(){
-                return test1;
-            },
-            set function(value){
-                test2 = value;
-            },
-            get function(){
-                return test2;
-            }
-        };      
-        var arr = [
-            'while' ,
-            'debugger', 
-            'function'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-4-8.js b/test/language/reserved-words/7.6.1-4-8.js
deleted file mode 100644
index 29e2fdc25e..0000000000
--- a/test/language/reserved-words/7.6.1-4-8.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-4-8
-description: >
-    Allow reserved words as property names by set function within an
-    object, verified with hasOwnProperty: this, with, default
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set this(value){
-                test0 = value;
-            },
-            get this(){
-                return test0;
-            },
-            set with(value){
-                test1 = value;
-            },
-            get with(){
-                return test1;
-            },
-            set default(value){
-                test2 = value;
-            },
-            get default(){
-                return test2;
-            }
-        };      
-        var arr = [
-            'this', 
-            'with', 
-            'default'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-4-9.js b/test/language/reserved-words/7.6.1-4-9.js
deleted file mode 100644
index e71237849a..0000000000
--- a/test/language/reserved-words/7.6.1-4-9.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-4-9
-description: >
-    Allow reserved words as property names by set function within an
-    object, verified with hasOwnProperty: if, throw, delete
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set if(value){
-                test0 = value;
-            },
-            get if(){
-                return test0;
-            },
-            set throw(value){
-                test1 = value;
-            },
-            get throw(){
-                return test1
-            },
-            set delete(value){
-                test2 = value;
-            },
-            get delete(){
-                return test2;
-            }
-        };      
-        var arr = [
-            'if', 
-            'throw', 
-            'delete'
-            ];
-        for(var p in tokenCodes) {       
-            for(var p1 in arr) {                
-                if(arr[p1] === p) {
-                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
-                }
-            }
-        }
diff --git a/test/language/reserved-words/7.6.1-5-1.js b/test/language/reserved-words/7.6.1-5-1.js
deleted file mode 100644
index e0a01a0764..0000000000
--- a/test/language/reserved-words/7.6.1-5-1.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-5-1
-description: >
-    Allow reserved words as property names at object initialization,
-    accessed via indexing: null, true, false
----*/
-
-        var tokenCodes  = { 
-            null: 0,
-            true: 1,
-            false: 2
-        };
-        var arr = [
-            'null',
-            'true',
-            'false'
-        ];  
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-5-10.js b/test/language/reserved-words/7.6.1-5-10.js
deleted file mode 100644
index e285af4064..0000000000
--- a/test/language/reserved-words/7.6.1-5-10.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-5-10
-description: >
-    Allow reserved words as property names at object initialization,
-    accessed via indexing: in, try, class
----*/
-
-        var tokenCodes  = { 
-            in: 0, 
-            try: 1,
-            class: 2
-        };
-        var arr = [
-            'in', 
-            'try',
-            'class'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-5-11.js b/test/language/reserved-words/7.6.1-5-11.js
deleted file mode 100644
index 1b28cff115..0000000000
--- a/test/language/reserved-words/7.6.1-5-11.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-5-11
-description: >
-    Allow reserved words as property names at object initialization,
-    accessed via indexing: enum, extends, super
----*/
-
-        var tokenCodes = {
-            enum: 0,
-            extends: 1,
-            super: 2
-        };
-        var arr = [
-            'enum',
-            'extends',
-            'super'
-        ];  
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-5-12.js b/test/language/reserved-words/7.6.1-5-12.js
deleted file mode 100644
index eb7dfd0bfb..0000000000
--- a/test/language/reserved-words/7.6.1-5-12.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-5-12
-description: >
-    Allow reserved words as property names at object initialization,
-    accessed via indexing: const, export, import
----*/
-
-        var tokenCodes = {
-            const : 0,
-            export: 1,
-            import: 2
-        };
-        var arr = [
-            'const',
-            'export',
-            'import'
-        ]; 
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-5-13.js b/test/language/reserved-words/7.6.1-5-13.js
deleted file mode 100644
index 2e6d20bd84..0000000000
--- a/test/language/reserved-words/7.6.1-5-13.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-5-13
-description: >
-    Allow reserved words as property names at object initialization,
-    accessed via indexing: implements, let, private
----*/
-
-        var tokenCodes = {
-            implements: 0,
-            let: 1,
-            private: 2
-        };
-        var arr = [
-            'implements',
-            'let',
-            'private'
-        ];   
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-5-14.js b/test/language/reserved-words/7.6.1-5-14.js
deleted file mode 100644
index a35df0d2f4..0000000000
--- a/test/language/reserved-words/7.6.1-5-14.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-5-14
-description: >
-    Allow reserved words as property names at object initialization,
-    accessed via indexing: public, yield, interface
----*/
-
-        var tokenCodes = {
-            public: 0,
-            yield: 1,
-            interface: 2
-        };
-        var arr = [
-            'public',
-            'yield',
-            'interface'
-        ]; 
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-5-15.js b/test/language/reserved-words/7.6.1-5-15.js
deleted file mode 100644
index 8cf154fb1b..0000000000
--- a/test/language/reserved-words/7.6.1-5-15.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-5-15
-description: >
-    Allow reserved words as property names at object initialization,
-    accessed via indexing: package, protected, static
----*/
-
-        var tokenCodes = {
-            package: 0,
-            protected: 1,
-            static: 2
-        };
-        var arr = [
-            'package',
-            'protected',
-            'static'
-        ];  
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-5-16.js b/test/language/reserved-words/7.6.1-5-16.js
deleted file mode 100644
index c4bb2b1e19..0000000000
--- a/test/language/reserved-words/7.6.1-5-16.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-5-16
-description: >
-    Allow reserved words as property names at object initialization,
-    accessed via indexing: undefined, NaN, Infinity
----*/
-
-        var tokenCodes = {
-            undefined: 0,
-            NaN: 1,
-            Infinity: 2
-        };
-        var arr = [
-            'undefined',
-            'NaN',
-            'Infinity'
-        ]; 
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-5-2.js b/test/language/reserved-words/7.6.1-5-2.js
deleted file mode 100644
index 6554bfd373..0000000000
--- a/test/language/reserved-words/7.6.1-5-2.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-5-2
-description: >
-    Allow reserved words as property names at object initialization,
-    accessed via indexing: break, case, do
----*/
-
-        var tokenCodes  = { 
-            break: 0,
-            case: 1,
-            do: 2
-        };
-        var arr = [
-            'break',
-            'case',
-            'do'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-5-3.js b/test/language/reserved-words/7.6.1-5-3.js
deleted file mode 100644
index 495c10a5c0..0000000000
--- a/test/language/reserved-words/7.6.1-5-3.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-5-3
-description: >
-    Allow reserved words as property names at object initialization,
-    accessed via indexing: instanceof, typeof, else
----*/
-
-        var tokenCodes  = { 
-            instanceof: 0,
-            typeof: 1,
-            else: 2
-        };
-        var arr = [
-            'instanceof',
-            'typeof',
-            'else'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-5-4.js b/test/language/reserved-words/7.6.1-5-4.js
deleted file mode 100644
index 69c0d1971e..0000000000
--- a/test/language/reserved-words/7.6.1-5-4.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-5-4
-description: >
-    Allow reserved words as property names at object initialization,
-    accessed via indexing: new, var, catch
----*/
-
-        var tokenCodes  = { 
-            new: 0,
-            var: 1,
-            catch: 2
-        };
-        var arr = [
-            'new', 
-            'var', 
-            'catch'
-        ]; 
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-5-5.js b/test/language/reserved-words/7.6.1-5-5.js
deleted file mode 100644
index 8a0bb2e67b..0000000000
--- a/test/language/reserved-words/7.6.1-5-5.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-5-5
-description: >
-    Allow reserved words as property names at object initialization,
-    accessed via indexing: finally, return, void
----*/
-
-        var tokenCodes  = { 
-            finally: 0,
-            return: 1,
-            void: 2
-        };
-        var arr = [ 
-            'finally', 
-            'return', 
-            'void'
-        ];  
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-5-6.js b/test/language/reserved-words/7.6.1-5-6.js
deleted file mode 100644
index af89ce7dc5..0000000000
--- a/test/language/reserved-words/7.6.1-5-6.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-5-6
-description: >
-    Allow reserved words as property names at object initialization,
-    accessed via indexing: continue, for, switch
----*/
-
-        var tokenCodes  = { 
-            continue: 0, 
-            for: 1, 
-            switch: 2
-        };
-        var arr = [
-            'continue', 
-            'for',
-            'switch'
-        ];  
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-5-7.js b/test/language/reserved-words/7.6.1-5-7.js
deleted file mode 100644
index f941c1fac0..0000000000
--- a/test/language/reserved-words/7.6.1-5-7.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-5-7
-description: >
-    Allow reserved words as property names at object initialization,
-    accessed via indexing: while, debugger, function
----*/
-
-        var tokenCodes  = { 
-            while: 0, 
-            debugger: 1, 
-            function: 2
-        };
-        var arr = [ 
-            'while' ,
-            'debugger', 
-            'function'
-        ];    
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-5-8.js b/test/language/reserved-words/7.6.1-5-8.js
deleted file mode 100644
index 8ba8c8514a..0000000000
--- a/test/language/reserved-words/7.6.1-5-8.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-5-8
-description: >
-    Allow reserved words as property names at object initialization,
-    accessed via indexing: this, with, default
----*/
-
-        var tokenCodes  = {       
-            this: 0,  
-            with: 1, 
-            default: 2
-        };
-        var arr = [ 
-            'this', 
-            'with', 
-            'default'
-        ]; 
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-5-9.js b/test/language/reserved-words/7.6.1-5-9.js
deleted file mode 100644
index addcefd695..0000000000
--- a/test/language/reserved-words/7.6.1-5-9.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-5-9
-description: >
-    Allow reserved words as property names at object initialization,
-    accessed via indexing: if, throw, delete
----*/
-
-        var tokenCodes  = { 
-            if: 0, 
-            throw: 1, 
-            delete: 2
-        };
-        var arr = [
-            'if', 
-            'throw', 
-            'delete'
-        ];   
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-6-1.js b/test/language/reserved-words/7.6.1-6-1.js
deleted file mode 100644
index 561d4bbb0c..0000000000
--- a/test/language/reserved-words/7.6.1-6-1.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-6-1
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    accessed via indexing: null, true, false
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.null = 0;
-	    tokenCodes.true = 1;
-	    tokenCodes.false = 2; 
-        var arr = [
-            'null',
-            'true',
-            'false'
-         ];
-         for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-6-10.js b/test/language/reserved-words/7.6.1-6-10.js
deleted file mode 100644
index df67a9d9f9..0000000000
--- a/test/language/reserved-words/7.6.1-6-10.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-6-10
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    accessed via indexing: in, try, class
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.in = 0;
-        tokenCodes.try = 1;
-        tokenCodes.class = 2;
-        var arr = [
-            'in', 
-            'try',
-            'class'
-         ];
-         for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-6-11.js b/test/language/reserved-words/7.6.1-6-11.js
deleted file mode 100644
index c4bbad191d..0000000000
--- a/test/language/reserved-words/7.6.1-6-11.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-6-11
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    accessed via indexing: enum, extends, super
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.enum = 0;
-        tokenCodes.extends = 1;
-        tokenCodes.super = 2;
-        var arr = [
-            'enum',
-            'extends',
-            'super'
-         ];
-         for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-6-12.js b/test/language/reserved-words/7.6.1-6-12.js
deleted file mode 100644
index c5869fc4da..0000000000
--- a/test/language/reserved-words/7.6.1-6-12.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-6-12
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    accessed via indexing: const, export, import
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.const = 0;
-        tokenCodes.export = 1;
-        tokenCodes.import = 2;
-        var arr = [
-            'const',
-            'export',
-            'import'
-         ];
-         for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-6-13.js b/test/language/reserved-words/7.6.1-6-13.js
deleted file mode 100644
index 3bab164674..0000000000
--- a/test/language/reserved-words/7.6.1-6-13.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-6-13
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    accessed via indexing: implements, let, private
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.implements = 0;
-        tokenCodes.let = 1;
-        tokenCodes.private = 2;
-        var arr = [
-            'implements',
-            'let',
-            'private'
-         ];
-         for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-6-14.js b/test/language/reserved-words/7.6.1-6-14.js
deleted file mode 100644
index 25ad3c13de..0000000000
--- a/test/language/reserved-words/7.6.1-6-14.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-6-14
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    accessed via indexing: public, yield, interface
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.public = 0;
-        tokenCodes.yield = 1;
-        tokenCodes.interface = 2;
-        var arr = [
-            'public',
-            'yield',
-            'interface'
-         ];
-         for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-6-15.js b/test/language/reserved-words/7.6.1-6-15.js
deleted file mode 100644
index 87cc5259f5..0000000000
--- a/test/language/reserved-words/7.6.1-6-15.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-6-15
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    accessed via indexing: package, protected, static
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.package = 0;
-        tokenCodes.protected = 1;
-        tokenCodes.static = 2;
-        var arr = [
-            'package',
-            'protected',
-            'static' 
-         ];
-         for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-6-16.js b/test/language/reserved-words/7.6.1-6-16.js
deleted file mode 100644
index a8480ac315..0000000000
--- a/test/language/reserved-words/7.6.1-6-16.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-6-16
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    accessed via indexing: undefined, NaN, Infinity
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.undefined = 0;
-        tokenCodes.NaN = 1;
-        tokenCodes.Infinity = 2;
-        var arr = [
-            'undefined',
-            'NaN',
-            'Infinity'
-         ];
-         for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-6-2.js b/test/language/reserved-words/7.6.1-6-2.js
deleted file mode 100644
index ce2858baba..0000000000
--- a/test/language/reserved-words/7.6.1-6-2.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-6-2
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    accessed via indexing: break, case, do
----*/
-
-        var tokenCodes = {};
-        tokenCodes.break = 0;  	
-        tokenCodes.case = 1;
-        tokenCodes.do = 2;
-        var arr = [
-            'break',
-            'case',
-            'do'
-         ];
-         for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-6-3.js b/test/language/reserved-words/7.6.1-6-3.js
deleted file mode 100644
index 76da8dc035..0000000000
--- a/test/language/reserved-words/7.6.1-6-3.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-6-3
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    accessed via indexing: instanceof, typeof, else
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.instanceof = 0;
-        tokenCodes.typeof = 1;
-        tokenCodes.else = 2;
-        var arr = [
-            'instanceof',
-            'typeof',
-            'else'
-         ];
-         for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-6-4.js b/test/language/reserved-words/7.6.1-6-4.js
deleted file mode 100644
index 1006c2c5bf..0000000000
--- a/test/language/reserved-words/7.6.1-6-4.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-6-4
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    accessed via indexing: new, var, catch
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.new = 0;
-        tokenCodes.var = 1;
-        tokenCodes.catch = 2;
-        var arr = [
-            'new', 
-            'var', 
-            'catch'
-         ];
-         for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-6-5.js b/test/language/reserved-words/7.6.1-6-5.js
deleted file mode 100644
index c69dee5132..0000000000
--- a/test/language/reserved-words/7.6.1-6-5.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-6-5
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    accessed via indexing: finally, return, void
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.finally = 0;
-        tokenCodes.return = 1;
-        tokenCodes.void = 2;
-        var arr = [
-            'finally', 
-            'return', 
-            'void'
-         ];
-         for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-6-6.js b/test/language/reserved-words/7.6.1-6-6.js
deleted file mode 100644
index 00ab0eacb7..0000000000
--- a/test/language/reserved-words/7.6.1-6-6.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-6-6
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    accessed via indexing: continue, for, switch
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.continue = 0;
-        tokenCodes.for = 1; 
-        tokenCodes.switch = 2;
-        var arr = [
-            'continue', 
-            'for',
-            'switch'
-         ];
-         for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-6-7.js b/test/language/reserved-words/7.6.1-6-7.js
deleted file mode 100644
index 8ae455dc01..0000000000
--- a/test/language/reserved-words/7.6.1-6-7.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-6-7
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    accessed via indexing: while, debugger, function
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.while = 0; 
-        tokenCodes.debugger = 1;
-        tokenCodes.function = 2; 
-        var arr = [
-            'while' ,
-            'debugger', 
-            'function'
-         ];
-         for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-6-8.js b/test/language/reserved-words/7.6.1-6-8.js
deleted file mode 100644
index 3fe91178ac..0000000000
--- a/test/language/reserved-words/7.6.1-6-8.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-6-8
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    accessed via indexing: this, with, default
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.this = 0; 
-        tokenCodes.with = 1; 
-        tokenCodes.default = 2;
-        var arr = [
-            'this', 
-            'with', 
-            'default'
-         ];
-         for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-6-9.js b/test/language/reserved-words/7.6.1-6-9.js
deleted file mode 100644
index 4deb78e795..0000000000
--- a/test/language/reserved-words/7.6.1-6-9.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-6-9
-description: >
-    Allow reserved words as property names by dot operator assignment,
-    accessed via indexing: if, throw, delete
----*/
-
-        var tokenCodes  = {};
-        tokenCodes.if = 0;
-        tokenCodes.throw = 1;
-        tokenCodes.delete = 2;
-        var arr = [
-            'if', 
-            'throw', 
-            'delete'
-         ];
-         for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-7-1.js b/test/language/reserved-words/7.6.1-7-1.js
deleted file mode 100644
index 9f133d685a..0000000000
--- a/test/language/reserved-words/7.6.1-7-1.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-7-1
-description: >
-    Allow reserved words as property names by index assignment,
-    accessed via indexing: null, true, false
----*/
-
-        var tokenCodes = {};
-        tokenCodes['null'] = 0;
-        tokenCodes['true'] = 1;
-        tokenCodes['false'] = 2;        
-        var arr = [
-            'null',
-            'true',
-            'false'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-7-10.js b/test/language/reserved-words/7.6.1-7-10.js
deleted file mode 100644
index 73a5f5388e..0000000000
--- a/test/language/reserved-words/7.6.1-7-10.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-7-10
-description: >
-    Allow reserved words as property names by index assignment,
-    accessed via indexing: in, try, class
----*/
-
-        var tokenCodes = {};
-        tokenCodes['in'] = 0;
-        tokenCodes['try'] = 1;
-        tokenCodes['class'] = 2;
-        var arr = [
-            'in',
-            'try',
-            'class'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-7-11.js b/test/language/reserved-words/7.6.1-7-11.js
deleted file mode 100644
index 71a9921cad..0000000000
--- a/test/language/reserved-words/7.6.1-7-11.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-7-11
-description: >
-    Allow reserved words as property names by index assignment,
-    accessed via indexing: enum, extends, super
----*/
-
-        var tokenCodes = {};
-        tokenCodes['enum'] = 0;
-        tokenCodes['extends'] = 1;
-        tokenCodes['super'] = 2;      
-        var arr = [
-            'enum',
-            'extends',
-            'super'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-7-12.js b/test/language/reserved-words/7.6.1-7-12.js
deleted file mode 100644
index a170a97104..0000000000
--- a/test/language/reserved-words/7.6.1-7-12.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-7-12
-description: >
-    Allow reserved words as property names by index assignment,
-    accessed via indexing: const, export, import
----*/
-
-        var tokenCodes = {};
-        tokenCodes['const'] = 0;
-        tokenCodes['export'] = 1;
-        tokenCodes['import'] = 2;      
-        var arr = [
-            'const',
-            'export',
-            'import'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-7-13.js b/test/language/reserved-words/7.6.1-7-13.js
deleted file mode 100644
index 867a4b1ef1..0000000000
--- a/test/language/reserved-words/7.6.1-7-13.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-7-13
-description: >
-    Allow reserved words as property names by index assignment,
-    accessed via indexing: implements, let, private
----*/
-
-        var tokenCodes = {};
-        tokenCodes['implements'] = 0;
-        tokenCodes['let'] = 1;
-        tokenCodes['private'] = 2;     
-        var arr = [
-            'implements',
-            'let',
-            'private'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-7-14.js b/test/language/reserved-words/7.6.1-7-14.js
deleted file mode 100644
index dbde3903df..0000000000
--- a/test/language/reserved-words/7.6.1-7-14.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-7-14
-description: >
-    Allow reserved words as property names by index assignment,
-    accessed via indexing: public, yield, interface
----*/
-
-        var tokenCodes = {};
-        tokenCodes['public'] = 0;
-        tokenCodes['yield'] = 1;
-        tokenCodes['interface'] = 2; 
-        var arr = [
-            'public',
-            'yield',
-            'interface'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-7-15.js b/test/language/reserved-words/7.6.1-7-15.js
deleted file mode 100644
index c86bf3c2b6..0000000000
--- a/test/language/reserved-words/7.6.1-7-15.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-7-15
-description: >
-    Allow reserved words as property names by index assignment,
-    accessed via indexing: package, protected, static
----*/
-
-        var tokenCodes = {};
-        tokenCodes['package'] = 0;
-        tokenCodes['protected'] = 1;
-        tokenCodes['static'] = 2;    
-        var arr = [
-            'package',
-            'protected',
-            'static' 
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-7-16.js b/test/language/reserved-words/7.6.1-7-16.js
deleted file mode 100644
index 610ff78b7c..0000000000
--- a/test/language/reserved-words/7.6.1-7-16.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-7-16
-description: >
-    Allow reserved words as property names by index assignment,
-    accessed via indexing: undefined, NaN, Infinity
----*/
-
-        var tokenCodes = {};
-        tokenCodes['undefined'] = 0;
-        tokenCodes['NaN'] = 1;
-        tokenCodes['Infinity'] = 2;     
-        var arr = [
-            'undefined',
-            'NaN',
-            'Infinity'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-7-2.js b/test/language/reserved-words/7.6.1-7-2.js
deleted file mode 100644
index 5fdb398806..0000000000
--- a/test/language/reserved-words/7.6.1-7-2.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-7-2
-description: >
-    Allow reserved words as property names by index assignment,
-    accessed via indexing: break, case, do
----*/
-
-        var tokenCodes = {};
-        tokenCodes['break'] = 0;
-        tokenCodes['case'] = 1;
-        tokenCodes['do'] = 2;     
-        var arr = [
-            'break',
-            'case',
-            'do'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-7-3.js b/test/language/reserved-words/7.6.1-7-3.js
deleted file mode 100644
index 6afbe6030f..0000000000
--- a/test/language/reserved-words/7.6.1-7-3.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-7-3
-description: >
-    Allow reserved words as property names by index assignment,
-    accessed via indexing: instanceof, typeof, else
----*/
-
-        var tokenCodes = {};
-        tokenCodes['instanceof'] = 0;
-        tokenCodes['typeof'] = 1;
-        tokenCodes['else'] = 2;     
-        var arr = [
-            'instanceof',
-            'typeof',
-            'else'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-7-4.js b/test/language/reserved-words/7.6.1-7-4.js
deleted file mode 100644
index 55211a2163..0000000000
--- a/test/language/reserved-words/7.6.1-7-4.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-7-4
-description: >
-    Allow reserved words as property names by index assignment,
-    accessed via indexing: new, var, catch
----*/
-
-        var tokenCodes = {};
-        tokenCodes['new'] = 0;
-        tokenCodes['var'] = 1;
-        tokenCodes['catch'] = 2;       
-        var arr = [
-            'new',
-            'var',
-            'catch'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-7-5.js b/test/language/reserved-words/7.6.1-7-5.js
deleted file mode 100644
index abc6344c92..0000000000
--- a/test/language/reserved-words/7.6.1-7-5.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-7-5
-description: >
-    Allow reserved words as property names by index assignment,
-    accessed via indexing: finally, return, void
----*/
-
-        var tokenCodes = {};
-        tokenCodes['finally'] = 0;
-        tokenCodes['return'] = 1;
-        tokenCodes['void'] = 2;      
-        var arr = [
-            'finally',
-            'return',
-            'void'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-7-6.js b/test/language/reserved-words/7.6.1-7-6.js
deleted file mode 100644
index 7a63adc9e9..0000000000
--- a/test/language/reserved-words/7.6.1-7-6.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-7-6
-description: >
-    Allow reserved words as property names by index assignment,
-    accessed via indexing: continue, for, switch
----*/
-
-        var tokenCodes = {};
-        tokenCodes['continue'] = 0;
-        tokenCodes['for'] = 1;
-        tokenCodes['switch'] = 2;     
-        var arr = [
-            'continue',
-            'for',
-            'switch'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-7-7.js b/test/language/reserved-words/7.6.1-7-7.js
deleted file mode 100644
index d3b80b67ab..0000000000
--- a/test/language/reserved-words/7.6.1-7-7.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-7-7
-description: >
-    Allow reserved words as property names by index assignment,
-    accessed via indexing: while, debugger, function
----*/
-
-        var tokenCodes = {};
-        tokenCodes['while'] = 0;
-        tokenCodes['debugger'] = 1;
-        tokenCodes['function'] = 2; 
-        var arr = [
-            'while',
-            'debugger',
-            'function'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-7-8.js b/test/language/reserved-words/7.6.1-7-8.js
deleted file mode 100644
index a5609cac27..0000000000
--- a/test/language/reserved-words/7.6.1-7-8.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-7-8
-description: >
-    Allow reserved words as property names by index assignment,
-    accessed via indexing: this, with, default
----*/
-
-        var tokenCodes = {};
-        tokenCodes['this'] = 0;
-        tokenCodes['with'] = 1;
-        tokenCodes['default'] = 2;   
-        var arr = [
-            'this',
-            'with',
-            'default'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-7-9.js b/test/language/reserved-words/7.6.1-7-9.js
deleted file mode 100644
index ddeb26bd7b..0000000000
--- a/test/language/reserved-words/7.6.1-7-9.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-7-9
-description: >
-    Allow reserved words as property names by index assignment,
-    accessed via indexing: if, throw, delete
----*/
-
-        var tokenCodes = {};
-        tokenCodes['if'] = 0;
-        tokenCodes['throw'] = 1;
-        tokenCodes['delete'] = 2;      
-        var arr = [
-            'if',
-            'throw',
-            'delete'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-8-1.js b/test/language/reserved-words/7.6.1-8-1.js
deleted file mode 100644
index 9b59ab56a1..0000000000
--- a/test/language/reserved-words/7.6.1-8-1.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-8-1
-description: >
-    Allow reserved words as property names by set function within an
-    object, accessed via indexing: null, true, false
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set null(value) {
-                test0 = value;        
-            },
-            get null() {
-                return test0;
-            },
-            set true(value) {
-                test1 = value;        
-            },
-            get true() {
-                return test1;
-            },
-            set false(value) {
-                test2 = value;        
-            },
-            get false(){
-                return test2;
-            }
-        }; 
-        var arr = [
-            'null',
-            'true',
-            'false'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-8-10.js b/test/language/reserved-words/7.6.1-8-10.js
deleted file mode 100644
index f45212e4af..0000000000
--- a/test/language/reserved-words/7.6.1-8-10.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-8-10
-description: >
-    Allow reserved words as property names by set function within an
-    object, accessed via indexing: in, try, class
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set in(value){
-                test0 = value;
-            },
-            get in(){
-                return test0;
-            },
-            set try(value){
-                test1 = value;
-            },
-            get try(){
-                return test1
-            },
-            set class(value){
-                test2 = value;
-            },
-            get class(){
-                return test2;
-            }
-        }; 
-        var arr = [
-            'in', 
-            'try',
-            'class'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-8-11.js b/test/language/reserved-words/7.6.1-8-11.js
deleted file mode 100644
index e40d5e3c74..0000000000
--- a/test/language/reserved-words/7.6.1-8-11.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-8-11
-description: >
-    Allow reserved words as property names by set function within an
-    object, accessed via indexing: enum, extends, super
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set enum(value){
-                test0 = value;
-            },
-            get enum(){
-                return test0;
-            },
-            set extends(value){
-                test1 = value;
-            },
-            get extends(){
-                return test1;
-            },
-            set super(value){
-                test2 = value;
-            }, 
-            get super(){
-                return test2;
-            }
-        }; 
-        var arr = [
-            'enum',
-            'extends',
-            'super'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-8-12.js b/test/language/reserved-words/7.6.1-8-12.js
deleted file mode 100644
index 408f9d7b10..0000000000
--- a/test/language/reserved-words/7.6.1-8-12.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-8-12
-description: >
-    Allow reserved words as property names by set function within an
-    object, accessed via indexing: const, export, import
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set const(value){
-                test0 = value;
-            },
-            get const(){
-                return test0;
-            },
-            set export(value){
-                test1 = value;
-            },
-            get export(){
-                return test1
-            },
-            set import(value){
-                test2 = value;
-            },
-            get import(){
-                return test2
-            }
-        }; 
-        var arr = [
-            'const',
-            'export',
-            'import'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-8-13.js b/test/language/reserved-words/7.6.1-8-13.js
deleted file mode 100644
index 9f96611bd2..0000000000
--- a/test/language/reserved-words/7.6.1-8-13.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-8-13
-description: >
-    Allow reserved words as property names by set function within an
-    object, accessed via indexing: implements, let, private
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set implements(value){
-                test0 = value;
-            },
-            get implements(){
-                return test0;
-            },
-            set let(value){
-                test1 = value;
-            },
-            get let(){
-                return test1
-            },
-            set private(value){
-                test2 = value;
-            },
-            get private(){
-                return test2;
-            }
-        }; 
-        var arr = [
-            'implements',
-            'let',
-            'private'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-8-14.js b/test/language/reserved-words/7.6.1-8-14.js
deleted file mode 100644
index 303b43fe17..0000000000
--- a/test/language/reserved-words/7.6.1-8-14.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-8-14
-description: >
-    Allow reserved words as property names by set function within an
-    object, accessed via indexing: public, yield, interface
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set public(value){
-                test0 = value;
-            },
-            get public(){
-                return test0;
-            },
-            set yield(value){
-                test1 = value;
-            },
-            get yield(){
-                return test1;
-            },
-            set interface(value){
-                test2 = value;
-            },
-            get interface(){
-                return test2;
-            }
-        }; 
-        var arr = [
-            'public',
-            'yield',
-            'interface'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-8-15.js b/test/language/reserved-words/7.6.1-8-15.js
deleted file mode 100644
index 96fad33bda..0000000000
--- a/test/language/reserved-words/7.6.1-8-15.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-8-15
-description: >
-    Allow reserved words as property names by set function within an
-    object, accessed via indexing: package, protected, static
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set package(value){
-                test0 = value;
-            },
-            get package(){
-                return test0;
-            },
-            set protected(value){
-                test1 = value;
-            },
-            get protected(){
-                return test1
-            },
-            set static(value){
-                test2 = value;
-            },
-            get static(){
-                return test2;
-            }
-        }; 
-        var arr = [
-            'package',
-            'protected',
-            'static'  
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-8-16.js b/test/language/reserved-words/7.6.1-8-16.js
deleted file mode 100644
index d83d5ad7ad..0000000000
--- a/test/language/reserved-words/7.6.1-8-16.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-8-16
-description: >
-    Allow reserved words as property names by set function within an
-    object, accessed via indexing: undefined, NaN, Infinity
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set undefined(value){
-                test0 = value;
-            },
-            get undefined(){
-                return test0;
-            },
-            set NaN(value){
-                test1 = value;
-            },
-            get NaN(){
-                return test1;
-            },
-            set Infinity(value){
-                test2 = value;
-            },
-            get Infinity(){
-                return test2;
-            }
-        }; 
-        var arr = [
-            'undefined',
-            'NaN',
-            'Infinity'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-8-2.js b/test/language/reserved-words/7.6.1-8-2.js
deleted file mode 100644
index fcb2bb984a..0000000000
--- a/test/language/reserved-words/7.6.1-8-2.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-8-2
-description: >
-    Allow reserved words as property names by set function within an
-    object, accessed via indexing: break, case, do
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set break(value){
-                test0 = value;        
-            },
-            get break(){
-                return test0;
-            },
-            set case(value){
-                test1 = value;
-            },
-            get case(){
-                return test1;
-            },
-            set do(value){
-                test2 = value;
-            },
-            get do(){
-                return test2;
-            }
-        }; 
-        var arr = [
-            'break',
-            'case',
-            'do'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-8-3.js b/test/language/reserved-words/7.6.1-8-3.js
deleted file mode 100644
index be9de6d11e..0000000000
--- a/test/language/reserved-words/7.6.1-8-3.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-8-3
-description: >
-    Allow reserved words as property names by set function within an
-    object, accessed via indexing: instanceof, typeof, else
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set instanceof(value){
-                test0 = value;
-            },
-            get instanceof(){
-                return test0;
-            },
-            set typeof(value){
-                test1 = value;
-            },
-            get typeof(){
-                return test1;
-            },
-            set else(value){
-                test2 = value;
-            },
-            get else(){
-                return test2;
-            }
-        }; 
-        var arr = [
-            'instanceof',
-            'typeof',
-            'else'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-8-4.js b/test/language/reserved-words/7.6.1-8-4.js
deleted file mode 100644
index 1dafc2bd4f..0000000000
--- a/test/language/reserved-words/7.6.1-8-4.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-8-4
-description: >
-    Allow reserved words as property names by set function within an
-    object, accessed via indexing: new, var, catch
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set new(value){
-                test0 = value;
-            },
-            get new(){
-                return test0;
-            },
-            set var(value){
-                test1 = value;
-            },
-            get var(){
-                return test1;
-            },
-            set catch(value){
-                test2 = value;
-            },
-            get catch(){
-                return test2;
-            }
-        }; 
-        var arr = [
-            'new', 
-            'var', 
-            'catch'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-8-5.js b/test/language/reserved-words/7.6.1-8-5.js
deleted file mode 100644
index 8c559e944d..0000000000
--- a/test/language/reserved-words/7.6.1-8-5.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-8-5
-description: >
-    Allow reserved words as property names by set function within an
-    object, accessed via indexing: finally, return, void
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set finally(value){
-                test0 = value;
-            },
-            get finally(){
-                return test0;
-            },
-            set return(value){
-                test1 = value;
-            },
-            get return(){
-                return test1;
-            },
-            set void(value){
-                test2 = value;
-            },
-            get void(){
-                return test2;
-            }
-        }; 
-        var arr = [
-            'finally', 
-            'return', 
-            'void'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-8-6.js b/test/language/reserved-words/7.6.1-8-6.js
deleted file mode 100644
index 8dbd116360..0000000000
--- a/test/language/reserved-words/7.6.1-8-6.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-8-6
-description: >
-    Allow reserved words as property names by set function within an
-    object, accessed via indexing: continue, for, switch
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set continue(value){
-                test0 = value;
-            },
-            get continue(){
-                return test0;
-            },
-            set for(value){
-                test1 = value;
-            },
-            get for(){
-                return test1;
-            },
-            set switch(value){
-                test2 = value;
-            },
-            get switch(){
-                return test2;
-            }
-        }; 
-        var arr = [
-            'continue', 
-            'for',
-            'switch'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-8-7.js b/test/language/reserved-words/7.6.1-8-7.js
deleted file mode 100644
index a352ea5fe4..0000000000
--- a/test/language/reserved-words/7.6.1-8-7.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-8-7
-description: >
-    Allow reserved words as property names by set function within an
-    object, accessed via indexing: while, debugger, function
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set while(value){
-                test0 = value;
-            },
-            get while(){
-                return test0
-            },
-            set debugger(value){
-                test1 = value;
-            },
-            get debugger(){
-                return test1;
-            },
-            set function(value){
-                test2 = value;
-            },
-            get function(){
-                return test2;
-            }
-        }; 
-        var arr = [
-            'while' ,
-            'debugger', 
-            'function'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-8-8.js b/test/language/reserved-words/7.6.1-8-8.js
deleted file mode 100644
index ec0146497d..0000000000
--- a/test/language/reserved-words/7.6.1-8-8.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-8-8
-description: >
-    Allow reserved words as property names by set function within an
-    object, accessed via indexing: this, with, default
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set this(value){
-                test0 = value;
-            },
-            get this(){
-                return test0;
-            },
-            set with(value){
-                test1 = value;
-            },
-            get with(){
-                return test1;
-            },
-            set default(value){
-                test2 = value;
-            },
-            get default(){
-                return test2;
-            }
-        }; 
-        var arr = [
-            'this', 
-            'with', 
-            'default'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1-8-9.js b/test/language/reserved-words/7.6.1-8-9.js
deleted file mode 100644
index 921f0503ed..0000000000
--- a/test/language/reserved-words/7.6.1-8-9.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1-8-9
-description: >
-    Allow reserved words as property names by set function within an
-    object, accessed via indexing: if, throw, delete
----*/
-
-        var test0 = 0, test1 = 1, test2 = 2;
-        var tokenCodes  = {
-            set if(value){
-                test0 = value;
-            },
-            get if(){
-                return test0;
-            },
-            set throw(value){
-                test1 = value;
-            },
-            get throw(){
-                return test1
-            },
-            set delete(value){
-                test2 = value;
-            },
-            get delete(){
-                return test2;
-            }
-        }; 
-        var arr = [
-            'if', 
-            'throw', 
-            'delete'
-        ];
-        for (var i = 0; i < arr.length; i++) {
-            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
-        }
diff --git a/test/language/reserved-words/7.6.1.2-1gs.js b/test/language/reserved-words/7.6.1.2-1gs.js
deleted file mode 100644
index 27752445ce..0000000000
--- a/test/language/reserved-words/7.6.1.2-1gs.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 7.6.1.2-1gs
-description: >
-    Strict Mode - SyntaxError is thrown when FutureReservedWord
-    'implements' occurs in strict mode code
-negative:
-  phase: early
-  type: SyntaxError
-flags: [onlyStrict]
----*/
-
-var implements = 1;
diff --git a/test/language/reserved-words/S7.6.1_A1.1.js b/test/language/reserved-words/S7.6.1_A1.1.js
deleted file mode 100644
index a7452d3dcf..0000000000
--- a/test/language/reserved-words/S7.6.1_A1.1.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2009 the Sputnik authors.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-info: The "null" token can not be used as identifier
-es5id: 7.6.1_A1.1
-description: Checking if execution of "null = 1" fails
-negative:
-  phase: early
-  type: ReferenceError
----*/
-
-null = 1;
diff --git a/test/language/reserved-words/S7.6.1_A1.2.js b/test/language/reserved-words/S7.6.1_A1.2.js
deleted file mode 100644
index ce5a346855..0000000000
--- a/test/language/reserved-words/S7.6.1_A1.2.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2009 the Sputnik authors.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-info: The "true" token can not be used as identifier
-es5id: 7.6.1_A1.2
-description: Checking if execution of "true=1" fails
-negative:
-  phase: early
-  type: ReferenceError
----*/
-
-true = 1;
diff --git a/test/language/reserved-words/S7.6.1_A1.3.js b/test/language/reserved-words/S7.6.1_A1.3.js
deleted file mode 100644
index 547858922b..0000000000
--- a/test/language/reserved-words/S7.6.1_A1.3.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2009 the Sputnik authors.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-info: The "false" token can not be used as identifier
-es5id: 7.6.1_A1.3
-description: Checking if execution of "false=1" fails
-negative:
-  phase: early
-  type: ReferenceError
----*/
-
-false = 1;
diff --git a/test/language/reserved-words/ident-name-global-property-accessor.js b/test/language/reserved-words/ident-name-global-property-accessor.js
new file mode 100644
index 0000000000..dd156dda06
--- /dev/null
+++ b/test/language/reserved-words/ident-name-global-property-accessor.js
@@ -0,0 +1,39 @@
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es5id: 7.6.1-4-16
+description: >
+    Allow global constant properties as property names by accessor function within an object.
+---*/
+
+var test;
+
+var tokenCodes = {
+    set undefined(value) { test = 'undefined'; },
+    get undefined() { return 'undefined'; },
+    set NaN(value) { test = 'NaN'; },
+    get NaN() { return 'NaN'; },
+    set Infinity(value) { test = 'Infinity'; },
+    get Infinity() { return 'Infinity'; },
+};
+
+var arr = [
+    'undefined',
+    'NaN',
+    'Infinity',
+];
+
+for (var i = 0; i < arr.length; ++i) {
+    var propertyName = arr[i];
+
+    assert(tokenCodes.hasOwnProperty(propertyName),
+           'Property "' + propertyName + '" found');
+
+    assert.sameValue(tokenCodes[propertyName], propertyName,
+                     'Property "' + propertyName + '" has correct value');
+
+    tokenCodes[propertyName] = 0;
+    assert.sameValue(test, propertyName,
+                     'Property "' + propertyName + '" sets correct value');
+}
diff --git a/test/language/reserved-words/ident-name-global-property-memberexpr-str.js b/test/language/reserved-words/ident-name-global-property-memberexpr-str.js
new file mode 100644
index 0000000000..c2301dae14
--- /dev/null
+++ b/test/language/reserved-words/ident-name-global-property-memberexpr-str.js
@@ -0,0 +1,30 @@
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es5id: 7.6.1-3-16
+description: >
+    Allow global constant properties as property names by index assignment.
+---*/
+
+var tokenCodes = {};
+
+tokenCodes['undefined'] = 'undefined';
+tokenCodes['NaN'] = 'NaN';
+tokenCodes['Infinity'] = 'Infinity';
+
+var arr = [
+    'undefined',
+    'NaN',
+    'Infinity',
+];
+
+for (var i = 0; i < arr.length; ++i) {
+    var propertyName = arr[i];
+
+    assert(tokenCodes.hasOwnProperty(propertyName),
+           'Property "' + propertyName + '" found');
+
+    assert.sameValue(tokenCodes[propertyName], propertyName,
+                     'Property "' + propertyName + '" has correct value');
+}
diff --git a/test/language/reserved-words/ident-name-global-property-memberexpr.js b/test/language/reserved-words/ident-name-global-property-memberexpr.js
new file mode 100644
index 0000000000..0348082cdf
--- /dev/null
+++ b/test/language/reserved-words/ident-name-global-property-memberexpr.js
@@ -0,0 +1,30 @@
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es5id: 7.6.1-2-16
+description: >
+    Allow global constant properties as property names by dot operator assignment
+---*/
+
+var tokenCodes = {};
+
+tokenCodes.undefined = 'undefined';
+tokenCodes.NaN = 'NaN';
+tokenCodes.Infinity = 'Infinity';
+
+var arr = [
+    'undefined',
+    'NaN',
+    'Infinity',
+];
+
+for (var i = 0; i < arr.length; ++i) {
+    var propertyName = arr[i];
+
+    assert(tokenCodes.hasOwnProperty(propertyName),
+           'Property "' + propertyName + '" found');
+
+    assert.sameValue(tokenCodes[propertyName], propertyName,
+                     'Property "' + propertyName + '" has correct value');
+}
diff --git a/test/language/reserved-words/ident-name-global-property-prop-name.js b/test/language/reserved-words/ident-name-global-property-prop-name.js
new file mode 100644
index 0000000000..0fff2aad02
--- /dev/null
+++ b/test/language/reserved-words/ident-name-global-property-prop-name.js
@@ -0,0 +1,30 @@
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es5id: 7.6.1-1-16
+description: >
+    Allow global constant properties as property names at object initialization.
+---*/
+
+var tokenCodes = {
+    undefined: 'undefined',
+    NaN: 'NaN',
+    Infinity: 'Infinity',
+};
+
+var arr = [
+    'undefined',
+    'NaN',
+    'Infinity'
+];
+
+for (var i = 0; i < arr.length; ++i) {
+    var propertyName = arr[i];
+
+    assert(tokenCodes.hasOwnProperty(propertyName),
+           'Property "' + propertyName + '" found');
+
+    assert.sameValue(tokenCodes[propertyName], propertyName,
+                     'Property "' + propertyName + '" has correct value');
+}
diff --git a/test/language/reserved-words/ident-name-keyword-accessor.js b/test/language/reserved-words/ident-name-keyword-accessor.js
new file mode 100644
index 0000000000..817f665444
--- /dev/null
+++ b/test/language/reserved-words/ident-name-keyword-accessor.js
@@ -0,0 +1,165 @@
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es5id: 7.6.1-4-2
+description: >
+    Allow reserved words as property names by accessor functions within an object.
+---*/
+
+var test;
+
+var tokenCodes = {
+    set await(value) { test = "await"; },
+    get await() { return "await"; },
+    set break(value) { test = "break"; },
+    get break() { return "break"; },
+    set case(value) { test = "case"; },
+    get case() { return "case"; },
+    set catch(value) { test = "catch"; },
+    get catch() { return "catch"; },
+    set class(value) { test = "class"; },
+    get class() { return "class"; },
+    set const(value) { test = "const"; },
+    get const() { return "const"; },
+    set continue(value) { test = "continue"; },
+    get continue() { return "continue"; },
+    set debugger(value) { test = "debugger"; },
+    get debugger() { return "debugger"; },
+    set default(value) { test = "default"; },
+    get default() { return "default"; },
+    set delete(value) { test = "delete"; },
+    get delete() { return "delete"; },
+    set do(value) { test = "do"; },
+    get do() { return "do"; },
+    set else(value) { test = "else"; },
+    get else() { return "else"; },
+    set export(value) { test = "export"; },
+    get export() { return "export"; },
+    set extends(value) { test = "extends"; },
+    get extends() { return "extends"; },
+    set finally(value) { test = "finally"; },
+    get finally() { return "finally"; },
+    set for(value) { test = "for"; },
+    get for() { return "for"; },
+    set function(value) { test = "function"; },
+    get function() { return "function"; },
+    set if(value) { test = "if"; },
+    get if() { return "if"; },
+    set import(value) { test = "import"; },
+    get import() { return "import"; },
+    set in(value) { test = "in"; },
+    get in() { return "in"; },
+    set instanceof(value) { test = "instanceof"; },
+    get instanceof() { return "instanceof"; },
+    set new(value) { test = "new"; },
+    get new() { return "new"; },
+    set return(value) { test = "return"; },
+    get return() { return "return"; },
+    set super(value) { test = "super"; },
+    get super() { return "super"; },
+    set switch(value) { test = "switch"; },
+    get switch() { return "switch"; },
+    set this(value) { test = "this"; },
+    get this() { return "this"; },
+    set throw(value) { test = "throw"; },
+    get throw() { return "throw"; },
+    set try(value) { test = "try"; },
+    get try() { return "try"; },
+    set typeof(value) { test = "typeof"; },
+    get typeof() { return "typeof"; },
+    set var(value) { test = "var"; },
+    get var() { return "var"; },
+    set void(value) { test = "void"; },
+    get void() { return "void"; },
+    set while(value) { test = "while"; },
+    get while() { return "while"; },
+    set with(value) { test = "with"; },
+    get with() { return "with"; },
+    set yield(value) { test = "yield"; },
+    get yield() { return "yield"; },
+
+    set enum(value) { test = "enum"; },
+    get enum() { return "enum"; },
+
+    set implements(value) { test = "implements"; },
+    get implements() { return "implements"; },
+    set interface(value) { test = "interface"; },
+    get interface() { return "interface"; },
+    set package(value) { test = "package"; },
+    get package() { return "package"; },
+    set private(value) { test = "private"; },
+    get private() { return "private"; },
+    set protected(value) { test = "protected"; },
+    get protected() { return "protected"; },
+    set public(value) { test = "public"; },
+    get public() { return "public"; },
+
+    set let(value) { test = "let"; },
+    get let() { return "let"; },
+    set static(value) { test = "static"; },
+    get static() { return "static"; },
+};
+
+var arr = [
+    'await',
+    'break',
+    'case',
+    'catch',
+    'class',
+    'const',
+    'continue',
+    'debugger',
+    'default',
+    'delete',
+    'do',
+    'else',
+    'export',
+    'extends',
+    'finally',
+    'for',
+    'function',
+    'if',
+    'import',
+    'in',
+    'instanceof',
+    'new',
+    'return',
+    'super',
+    'switch',
+    'this',
+    'throw',
+    'try',
+    'typeof',
+    'var',
+    'void',
+    'while',
+    'with',
+    'yield',
+
+    'enum',
+
+    'implements',
+    'interface',
+    'package',
+    'protected',
+    'private',
+    'public',
+
+    'let',
+    'static',
+];
+
+for (var i = 0; i < arr.length; ++i) {
+    var propertyName = arr[i];
+
+    assert(tokenCodes.hasOwnProperty(propertyName),
+           'Property "' + propertyName + '" found');
+
+    assert.sameValue(tokenCodes[propertyName], propertyName,
+                     'Property "' + propertyName + '" has correct value');
+
+    tokenCodes[propertyName] = 0;
+    assert.sameValue(test, propertyName,
+                     'Property "' + propertyName + '" sets correct value');
+}
diff --git a/test/language/reserved-words/ident-name-keyword-memberexpr-str.js b/test/language/reserved-words/ident-name-keyword-memberexpr-str.js
new file mode 100644
index 0000000000..a6bc1b2b44
--- /dev/null
+++ b/test/language/reserved-words/ident-name-keyword-memberexpr-str.js
@@ -0,0 +1,117 @@
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es5id: 7.6.1-3-2
+description: >
+    Allow reserved words as property names by index assignment.
+---*/
+
+var tokenCodes = {};
+
+tokenCodes['await'] = 'await';
+tokenCodes['break'] = 'break';
+tokenCodes['case'] = 'case';
+tokenCodes['catch'] = 'catch';
+tokenCodes['class'] = 'class';
+tokenCodes['const'] = 'const';
+tokenCodes['continue'] = 'continue';
+tokenCodes['debugger'] = 'debugger';
+tokenCodes['default'] = 'default';
+tokenCodes['delete'] = 'delete';
+tokenCodes['do'] = 'do';
+tokenCodes['else'] = 'else';
+tokenCodes['export'] = 'export';
+tokenCodes['extends'] = 'extends';
+tokenCodes['finally'] = 'finally';
+tokenCodes['for'] = 'for';
+tokenCodes['function'] = 'function';
+tokenCodes['if'] = 'if';
+tokenCodes['import'] = 'import';
+tokenCodes['in'] = 'in';
+tokenCodes['instanceof'] = 'instanceof';
+tokenCodes['new'] = 'new';
+tokenCodes['return'] = 'return';
+tokenCodes['super'] = 'super';
+tokenCodes['switch'] = 'switch';
+tokenCodes['this'] = 'this';
+tokenCodes['throw'] = 'throw';
+tokenCodes['try'] = 'try';
+tokenCodes['typeof'] = 'typeof';
+tokenCodes['var'] = 'var';
+tokenCodes['void'] = 'void';
+tokenCodes['while'] = 'while';
+tokenCodes['with'] = 'with';
+tokenCodes['yield'] = 'yield';
+
+tokenCodes['enum'] = 'enum';
+
+tokenCodes['implements'] = 'implements';
+tokenCodes['interface'] = 'interface';
+tokenCodes['package'] = 'package';
+tokenCodes['protected'] = 'protected';
+tokenCodes['private'] = 'private';
+tokenCodes['public'] = 'public';
+
+tokenCodes['let'] = 'let';
+tokenCodes['static'] = 'static';
+
+
+var arr = [
+    'await',
+    'break',
+    'case',
+    'catch',
+    'class',
+    'const',
+    'continue',
+    'debugger',
+    'default',
+    'delete',
+    'do',
+    'else',
+    'export',
+    'extends',
+    'finally',
+    'for',
+    'function',
+    'if',
+    'import',
+    'in',
+    'instanceof',
+    'new',
+    'return',
+    'super',
+    'switch',
+    'this',
+    'throw',
+    'try',
+    'typeof',
+    'var',
+    'void',
+    'while',
+    'with',
+    'yield',
+
+    'enum',
+
+    'implements',
+    'interface',
+    'package',
+    'protected',
+    'private',
+    'public',
+
+    'let',
+    'static',
+];
+
+for (var i = 0; i < arr.length; ++i) {
+    var propertyName = arr[i];
+
+    assert(tokenCodes.hasOwnProperty(propertyName),
+           'Property "' + propertyName + '" found');
+
+    assert.sameValue(tokenCodes[propertyName], propertyName,
+                     'Property "' + propertyName + '" has correct value');
+}
diff --git a/test/language/reserved-words/ident-name-keyword-memberexpr.js b/test/language/reserved-words/ident-name-keyword-memberexpr.js
new file mode 100644
index 0000000000..f5f6a683a5
--- /dev/null
+++ b/test/language/reserved-words/ident-name-keyword-memberexpr.js
@@ -0,0 +1,116 @@
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es5id: 7.6.1-2-2
+description: >
+    Allow reserved words as property names by dot operator assignment.
+---*/
+
+var tokenCodes = {};
+
+tokenCodes.await = 'await';
+tokenCodes.break = 'break';
+tokenCodes.case = 'case';
+tokenCodes.catch = 'catch';
+tokenCodes.class = 'class';
+tokenCodes.const = 'const';
+tokenCodes.continue = 'continue';
+tokenCodes.debugger = 'debugger';
+tokenCodes.default = 'default';
+tokenCodes.delete = 'delete';
+tokenCodes.do = 'do';
+tokenCodes.else = 'else';
+tokenCodes.export = 'export';
+tokenCodes.extends = 'extends';
+tokenCodes.finally = 'finally';
+tokenCodes.for = 'for';
+tokenCodes.function = 'function';
+tokenCodes.if = 'if';
+tokenCodes.import = 'import';
+tokenCodes.in = 'in';
+tokenCodes.instanceof = 'instanceof';
+tokenCodes.new = 'new';
+tokenCodes.return = 'return';
+tokenCodes.super = 'super';
+tokenCodes.switch = 'switch';
+tokenCodes.this = 'this';
+tokenCodes.throw = 'throw';
+tokenCodes.try = 'try';
+tokenCodes.typeof = 'typeof';
+tokenCodes.var = 'var';
+tokenCodes.void = 'void';
+tokenCodes.while = 'while';
+tokenCodes.with = 'with';
+tokenCodes.yield = 'yield';
+
+tokenCodes.enum = 'enum';
+
+tokenCodes.implements = 'implements';
+tokenCodes.interface = 'interface';
+tokenCodes.package = 'package';
+tokenCodes.protected = 'protected';
+tokenCodes.private = 'private';
+tokenCodes.public = 'public';
+
+tokenCodes.let = 'let';
+tokenCodes.static = 'static';
+
+var arr = [
+    'await',
+    'break',
+    'case',
+    'catch',
+    'class',
+    'const',
+    'continue',
+    'debugger',
+    'default',
+    'delete',
+    'do',
+    'else',
+    'export',
+    'extends',
+    'finally',
+    'for',
+    'function',
+    'if',
+    'import',
+    'in',
+    'instanceof',
+    'new',
+    'return',
+    'super',
+    'switch',
+    'this',
+    'throw',
+    'try',
+    'typeof',
+    'var',
+    'void',
+    'while',
+    'with',
+    'yield',
+
+    'enum',
+
+    'implements',
+    'interface',
+    'package',
+    'protected',
+    'private',
+    'public',
+
+    'let',
+    'static',
+];
+
+for (var i = 0; i < arr.length; ++i) {
+    var propertyName = arr[i];
+
+    assert(tokenCodes.hasOwnProperty(propertyName),
+           'Property "' + propertyName + '" found');
+
+    assert.sameValue(tokenCodes[propertyName], propertyName,
+                     'Property "' + propertyName + '" has correct value');
+}
diff --git a/test/language/reserved-words/ident-name-keyword-prop-name.js b/test/language/reserved-words/ident-name-keyword-prop-name.js
new file mode 100644
index 0000000000..3b9fd789de
--- /dev/null
+++ b/test/language/reserved-words/ident-name-keyword-prop-name.js
@@ -0,0 +1,116 @@
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es5id: 7.6.1-1-2
+description: >
+    Allow reserved words as property names at object initialization.
+---*/
+
+var tokenCodes = {
+    await: 'await',
+    break: 'break',
+    case: 'case',
+    catch: 'catch',
+    class: 'class',
+    const: 'const',
+    continue: 'continue',
+    debugger: 'debugger',
+    default: 'default',
+    delete: 'delete',
+    do: 'do',
+    else: 'else',
+    export: 'export',
+    extends: 'extends',
+    finally: 'finally',
+    for: 'for',
+    function: 'function',
+    if: 'if',
+    import: 'import',
+    in: 'in',
+    instanceof: 'instanceof',
+    new: 'new',
+    return: 'return',
+    super: 'super',
+    switch: 'switch',
+    this: 'this',
+    throw: 'throw',
+    try: 'try',
+    typeof: 'typeof',
+    var: 'var',
+    void: 'void',
+    while: 'while',
+    with: 'with',
+    yield: 'yield',
+
+    enum: 'enum',
+
+    implements: 'implements',
+    interface: 'interface',
+    package: 'package',
+    protected: 'protected',
+    private: 'private',
+    public: 'public',
+
+    let: 'let',
+    static: 'static',
+};
+
+var arr = [
+    'await',
+    'break',
+    'case',
+    'catch',
+    'class',
+    'const',
+    'continue',
+    'debugger',
+    'default',
+    'delete',
+    'do',
+    'else',
+    'export',
+    'extends',
+    'finally',
+    'for',
+    'function',
+    'if',
+    'import',
+    'in',
+    'instanceof',
+    'new',
+    'return',
+    'super',
+    'switch',
+    'this',
+    'throw',
+    'try',
+    'typeof',
+    'var',
+    'void',
+    'while',
+    'with',
+    'yield',
+
+    'enum',
+
+    'implements',
+    'interface',
+    'package',
+    'protected',
+    'private',
+    'public',
+
+    'let',
+    'static',
+];
+
+for (var i = 0; i < arr.length; ++i) {
+    var propertyName = arr[i];
+
+    assert(tokenCodes.hasOwnProperty(propertyName),
+           'Property "' + propertyName + '" found');
+
+    assert.sameValue(tokenCodes[propertyName], propertyName,
+                     'Property "' + propertyName + '" has correct value');
+}
diff --git a/test/language/reserved-words/ident-name-reserved-word-literal-accessor.js b/test/language/reserved-words/ident-name-reserved-word-literal-accessor.js
new file mode 100644
index 0000000000..5ff5298a77
--- /dev/null
+++ b/test/language/reserved-words/ident-name-reserved-word-literal-accessor.js
@@ -0,0 +1,39 @@
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es5id: 7.6.1-4-1
+description: >
+    Allow reserved words as property names by accessor function within an object.
+---*/
+
+var test;
+
+var tokenCodes = {
+    set null(value) { test = 'null'; },
+    get null() { return 'null'; },
+    set true(value) { test = 'true'; },
+    get true() { return 'true'; },
+    set false(value) { test = 'false'; },
+    get false() { return 'false'; },
+};
+
+var arr = [
+        'null',
+        'true',
+        'false',
+];
+
+for (var i = 0; i < arr.length; ++i) {
+    var propertyName = arr[i];
+
+    assert(tokenCodes.hasOwnProperty(propertyName),
+           'Property "' + propertyName + '" found');
+
+    assert.sameValue(tokenCodes[propertyName], propertyName,
+                     'Property "' + propertyName + '" has correct value');
+
+    tokenCodes[propertyName] = 0;
+    assert.sameValue(test, propertyName,
+                     'Property "' + propertyName + '" sets correct value');
+}
diff --git a/test/language/reserved-words/ident-name-reserved-word-literal-memberexpr-str.js b/test/language/reserved-words/ident-name-reserved-word-literal-memberexpr-str.js
new file mode 100644
index 0000000000..373461b100
--- /dev/null
+++ b/test/language/reserved-words/ident-name-reserved-word-literal-memberexpr-str.js
@@ -0,0 +1,30 @@
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es5id: 7.6.1-3-1
+description: >
+    Allow reserved words as property names by index assignment.
+---*/
+
+var tokenCodes = {};
+
+tokenCodes['null'] = 'null';
+tokenCodes['true'] = 'true';
+tokenCodes['false'] = 'false';
+
+var arr = [
+    'null',
+    'true',
+    'false',
+];
+
+for (var i = 0; i < arr.length; ++i) {
+    var propertyName = arr[i];
+
+    assert(tokenCodes.hasOwnProperty(propertyName),
+           'Property "' + propertyName + '" found');
+
+    assert.sameValue(tokenCodes[propertyName], propertyName,
+                     'Property "' + propertyName + '" has correct value');
+}
diff --git a/test/language/reserved-words/ident-name-reserved-word-literal-memberexpr.js b/test/language/reserved-words/ident-name-reserved-word-literal-memberexpr.js
new file mode 100644
index 0000000000..d4d345989d
--- /dev/null
+++ b/test/language/reserved-words/ident-name-reserved-word-literal-memberexpr.js
@@ -0,0 +1,30 @@
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es5id: 7.6.1-2-1
+description: >
+    Allow reserved words as property names by dot operator assignment.
+---*/
+
+var tokenCodes = {};
+
+tokenCodes.null = 'null';
+tokenCodes.true = 'true';
+tokenCodes.false = 'false';
+
+var arr = [
+    'null',
+    'true',
+    'false',
+];
+
+for (var i = 0; i < arr.length; ++i) {
+    var propertyName = arr[i];
+
+    assert(tokenCodes.hasOwnProperty(propertyName),
+           'Property "' + propertyName + '" found');
+
+    assert.sameValue(tokenCodes[propertyName], propertyName,
+                     'Property "' + propertyName + '" has correct value');
+}
diff --git a/test/language/reserved-words/ident-name-reserved-word-literal-prop-name.js b/test/language/reserved-words/ident-name-reserved-word-literal-prop-name.js
new file mode 100644
index 0000000000..6384463f35
--- /dev/null
+++ b/test/language/reserved-words/ident-name-reserved-word-literal-prop-name.js
@@ -0,0 +1,30 @@
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es5id: 7.6.1-1-1
+description: >
+    Allow reserved words as property names at object initialization.
+---*/
+
+var tokenCodes = {
+    null: 'null',
+    true: 'true',
+    false: 'false',
+};
+
+var arr = [
+    'null',
+    'true',
+    'false',
+];
+
+for (var i = 0; i < arr.length; ++i) {
+    var propertyName = arr[i];
+
+    assert(tokenCodes.hasOwnProperty(propertyName),
+           'Property "' + propertyName + '" found');
+
+    assert.sameValue(tokenCodes[propertyName], propertyName,
+                     'Property "' + propertyName + '" has correct value');
+}
diff --git a/test/language/reserved-words/ident-reference-false-escaped.js b/test/language/reserved-words/ident-reference-false-escaped.js
new file mode 100644
index 0000000000..65e06067f5
--- /dev/null
+++ b/test/language/reserved-words/ident-reference-false-escaped.js
@@ -0,0 +1,18 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-identifiers-static-semantics-early-errors
+description: >
+  `false` is a reserved word and cannot be used as an identifier reference.
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
+negative:
+  phase: early
+  type: SyntaxError
+---*/
+
+f\u0061lse = 0;
diff --git a/test/language/reserved-words/ident-reference-false.js b/test/language/reserved-words/ident-reference-false.js
new file mode 100644
index 0000000000..eb3da278ce
--- /dev/null
+++ b/test/language/reserved-words/ident-reference-false.js
@@ -0,0 +1,21 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-identifiers-static-semantics-early-errors
+description: >
+  `false` is a reserved word and cannot be used as an identifier reference.
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
+negative:
+  phase: early
+  type: SyntaxError
+---*/
+
+// It's tempting to write `false = 0`, but that'd be a test to validate `false`
+// is not a valid simple assignment target, cf. tests in language/expressions/assignment.
+// Also see: sec-semantics-static-semantics-isvalidsimpleassignmenttarget
+({false});
diff --git a/test/language/reserved-words/ident-reference-null-escaped.js b/test/language/reserved-words/ident-reference-null-escaped.js
new file mode 100644
index 0000000000..55f20424b6
--- /dev/null
+++ b/test/language/reserved-words/ident-reference-null-escaped.js
@@ -0,0 +1,18 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-identifiers-static-semantics-early-errors
+description: >
+  `false` is a reserved word and cannot be used as an identifier reference.
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
+negative:
+  phase: early
+  type: SyntaxError
+---*/
+
+nul\u006c = 0;
diff --git a/test/language/reserved-words/ident-reference-null.js b/test/language/reserved-words/ident-reference-null.js
new file mode 100644
index 0000000000..50102d9695
--- /dev/null
+++ b/test/language/reserved-words/ident-reference-null.js
@@ -0,0 +1,21 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-identifiers-static-semantics-early-errors
+description: >
+  `false` is a reserved word and cannot be used as an identifier reference.
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
+negative:
+  phase: early
+  type: SyntaxError
+---*/
+
+// It's tempting to write `null = 0`, but that'd be a test to validate `null`
+// is not a valid simple assignment target, cf. tests in language/expressions/assignment.
+// Also see: sec-semantics-static-semantics-isvalidsimpleassignmenttarget
+({null});
diff --git a/test/language/reserved-words/ident-reference-true-escaped.js b/test/language/reserved-words/ident-reference-true-escaped.js
new file mode 100644
index 0000000000..5c74761430
--- /dev/null
+++ b/test/language/reserved-words/ident-reference-true-escaped.js
@@ -0,0 +1,18 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-identifiers-static-semantics-early-errors
+description: >
+  `false` is a reserved word and cannot be used as an identifier reference.
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
+negative:
+  phase: early
+  type: SyntaxError
+---*/
+
+tru\u0065 = 0;
diff --git a/test/language/reserved-words/ident-reference-true.js b/test/language/reserved-words/ident-reference-true.js
new file mode 100644
index 0000000000..d24cc8a0a5
--- /dev/null
+++ b/test/language/reserved-words/ident-reference-true.js
@@ -0,0 +1,21 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-identifiers-static-semantics-early-errors
+description: >
+  `false` is a reserved word and cannot be used as an identifier reference.
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
+negative:
+  phase: early
+  type: SyntaxError
+---*/
+
+// It's tempting to write `true = 0`, but that'd be a test to validate `true`
+// is not a valid simple assignment target, cf. tests in language/expressions/assignment.
+// Also see: sec-semantics-static-semantics-isvalidsimpleassignmenttarget
+({true});
diff --git a/test/language/reserved-words/label-ident-false-escaped.js b/test/language/reserved-words/label-ident-false-escaped.js
new file mode 100644
index 0000000000..ff864e3800
--- /dev/null
+++ b/test/language/reserved-words/label-ident-false-escaped.js
@@ -0,0 +1,18 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-identifiers-static-semantics-early-errors
+description: >
+  `false` is a reserved word and cannot be used as a label identifier.
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
+negative:
+  phase: early
+  type: SyntaxError
+---*/
+
+f\u0061lse: ;
diff --git a/test/language/reserved-words/label-ident-false.js b/test/language/reserved-words/label-ident-false.js
new file mode 100644
index 0000000000..13302f2e3e
--- /dev/null
+++ b/test/language/reserved-words/label-ident-false.js
@@ -0,0 +1,18 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-identifiers-static-semantics-early-errors
+description: >
+  `false` is a reserved word and cannot be used as a label identifier.
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
+negative:
+  phase: early
+  type: SyntaxError
+---*/
+
+false: ;
diff --git a/test/language/reserved-words/label-ident-null-escaped.js b/test/language/reserved-words/label-ident-null-escaped.js
new file mode 100644
index 0000000000..94509c6224
--- /dev/null
+++ b/test/language/reserved-words/label-ident-null-escaped.js
@@ -0,0 +1,18 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-identifiers-static-semantics-early-errors
+description: >
+  `false` is a reserved word and cannot be used as a label identifier.
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
+negative:
+  phase: early
+  type: SyntaxError
+---*/
+
+nul\u006c: ;
diff --git a/test/language/reserved-words/label-ident-null.js b/test/language/reserved-words/label-ident-null.js
new file mode 100644
index 0000000000..82433ebdfc
--- /dev/null
+++ b/test/language/reserved-words/label-ident-null.js
@@ -0,0 +1,18 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-identifiers-static-semantics-early-errors
+description: >
+  `false` is a reserved word and cannot be used as a label identifier.
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
+negative:
+  phase: early
+  type: SyntaxError
+---*/
+
+null: ;
diff --git a/test/language/reserved-words/label-ident-true-escaped.js b/test/language/reserved-words/label-ident-true-escaped.js
new file mode 100644
index 0000000000..df4cfcbffa
--- /dev/null
+++ b/test/language/reserved-words/label-ident-true-escaped.js
@@ -0,0 +1,18 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-identifiers-static-semantics-early-errors
+description: >
+  `false` is a reserved word and cannot be used as a label identifier.
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
+negative:
+  phase: early
+  type: SyntaxError
+---*/
+
+tru\u0065: ;
diff --git a/test/language/reserved-words/label-ident-true.js b/test/language/reserved-words/label-ident-true.js
new file mode 100644
index 0000000000..30ff9c4579
--- /dev/null
+++ b/test/language/reserved-words/label-ident-true.js
@@ -0,0 +1,18 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-identifiers-static-semantics-early-errors
+description: >
+  `false` is a reserved word and cannot be used as a label identifier.
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
+negative:
+  phase: early
+  type: SyntaxError
+---*/
+
+true: ;
diff --git a/test/language/reserved-words/S7.6.1_A2.js b/test/language/reserved-words/unreserved-words.js
similarity index 100%
rename from test/language/reserved-words/S7.6.1_A2.js
rename to test/language/reserved-words/unreserved-words.js
-- 
GitLab