diff --git a/test/annexB/built-ins/Object/prototype/__defineGetter__/define-abrupt.js b/test/built-ins/Object/prototype/__defineGetter__/define-abrupt.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineGetter__/define-abrupt.js
rename to test/built-ins/Object/prototype/__defineGetter__/define-abrupt.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineGetter__/define-existing.js b/test/built-ins/Object/prototype/__defineGetter__/define-existing.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineGetter__/define-existing.js
rename to test/built-ins/Object/prototype/__defineGetter__/define-existing.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineGetter__/define-new.js b/test/built-ins/Object/prototype/__defineGetter__/define-new.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineGetter__/define-new.js
rename to test/built-ins/Object/prototype/__defineGetter__/define-new.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineGetter__/define-non-configurable.js b/test/built-ins/Object/prototype/__defineGetter__/define-non-configurable.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineGetter__/define-non-configurable.js
rename to test/built-ins/Object/prototype/__defineGetter__/define-non-configurable.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineGetter__/define-non-extensible.js b/test/built-ins/Object/prototype/__defineGetter__/define-non-extensible.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineGetter__/define-non-extensible.js
rename to test/built-ins/Object/prototype/__defineGetter__/define-non-extensible.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineGetter__/getter-non-callable.js b/test/built-ins/Object/prototype/__defineGetter__/getter-non-callable.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineGetter__/getter-non-callable.js
rename to test/built-ins/Object/prototype/__defineGetter__/getter-non-callable.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineGetter__/key-invalid.js b/test/built-ins/Object/prototype/__defineGetter__/key-invalid.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineGetter__/key-invalid.js
rename to test/built-ins/Object/prototype/__defineGetter__/key-invalid.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineGetter__/length.js b/test/built-ins/Object/prototype/__defineGetter__/length.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineGetter__/length.js
rename to test/built-ins/Object/prototype/__defineGetter__/length.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineGetter__/name.js b/test/built-ins/Object/prototype/__defineGetter__/name.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineGetter__/name.js
rename to test/built-ins/Object/prototype/__defineGetter__/name.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineGetter__/prop-desc.js b/test/built-ins/Object/prototype/__defineGetter__/prop-desc.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineGetter__/prop-desc.js
rename to test/built-ins/Object/prototype/__defineGetter__/prop-desc.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineGetter__/this-non-obj.js b/test/built-ins/Object/prototype/__defineGetter__/this-non-obj.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineGetter__/this-non-obj.js
rename to test/built-ins/Object/prototype/__defineGetter__/this-non-obj.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineSetter__/define-abrupt.js b/test/built-ins/Object/prototype/__defineSetter__/define-abrupt.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineSetter__/define-abrupt.js
rename to test/built-ins/Object/prototype/__defineSetter__/define-abrupt.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineSetter__/define-existing.js b/test/built-ins/Object/prototype/__defineSetter__/define-existing.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineSetter__/define-existing.js
rename to test/built-ins/Object/prototype/__defineSetter__/define-existing.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineSetter__/define-new.js b/test/built-ins/Object/prototype/__defineSetter__/define-new.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineSetter__/define-new.js
rename to test/built-ins/Object/prototype/__defineSetter__/define-new.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineSetter__/define-non-configurable.js b/test/built-ins/Object/prototype/__defineSetter__/define-non-configurable.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineSetter__/define-non-configurable.js
rename to test/built-ins/Object/prototype/__defineSetter__/define-non-configurable.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineSetter__/define-non-extensible.js b/test/built-ins/Object/prototype/__defineSetter__/define-non-extensible.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineSetter__/define-non-extensible.js
rename to test/built-ins/Object/prototype/__defineSetter__/define-non-extensible.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineSetter__/key-invalid.js b/test/built-ins/Object/prototype/__defineSetter__/key-invalid.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineSetter__/key-invalid.js
rename to test/built-ins/Object/prototype/__defineSetter__/key-invalid.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineSetter__/length.js b/test/built-ins/Object/prototype/__defineSetter__/length.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineSetter__/length.js
rename to test/built-ins/Object/prototype/__defineSetter__/length.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineSetter__/name.js b/test/built-ins/Object/prototype/__defineSetter__/name.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineSetter__/name.js
rename to test/built-ins/Object/prototype/__defineSetter__/name.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineSetter__/prop-desc.js b/test/built-ins/Object/prototype/__defineSetter__/prop-desc.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineSetter__/prop-desc.js
rename to test/built-ins/Object/prototype/__defineSetter__/prop-desc.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineSetter__/setter-non-callable.js b/test/built-ins/Object/prototype/__defineSetter__/setter-non-callable.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineSetter__/setter-non-callable.js
rename to test/built-ins/Object/prototype/__defineSetter__/setter-non-callable.js
diff --git a/test/annexB/built-ins/Object/prototype/__defineSetter__/this-non-obj.js b/test/built-ins/Object/prototype/__defineSetter__/this-non-obj.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__defineSetter__/this-non-obj.js
rename to test/built-ins/Object/prototype/__defineSetter__/this-non-obj.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupGetter__/key-invalid.js b/test/built-ins/Object/prototype/__lookupGetter__/key-invalid.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupGetter__/key-invalid.js
rename to test/built-ins/Object/prototype/__lookupGetter__/key-invalid.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupGetter__/length.js b/test/built-ins/Object/prototype/__lookupGetter__/length.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupGetter__/length.js
rename to test/built-ins/Object/prototype/__lookupGetter__/length.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-not-found.js b/test/built-ins/Object/prototype/__lookupGetter__/lookup-not-found.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-not-found.js
rename to test/built-ins/Object/prototype/__lookupGetter__/lookup-not-found.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-own-acsr-w-getter.js b/test/built-ins/Object/prototype/__lookupGetter__/lookup-own-acsr-w-getter.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-own-acsr-w-getter.js
rename to test/built-ins/Object/prototype/__lookupGetter__/lookup-own-acsr-w-getter.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-own-acsr-wo-getter.js b/test/built-ins/Object/prototype/__lookupGetter__/lookup-own-acsr-wo-getter.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-own-acsr-wo-getter.js
rename to test/built-ins/Object/prototype/__lookupGetter__/lookup-own-acsr-wo-getter.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-own-data.js b/test/built-ins/Object/prototype/__lookupGetter__/lookup-own-data.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-own-data.js
rename to test/built-ins/Object/prototype/__lookupGetter__/lookup-own-data.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-own-get-err.js b/test/built-ins/Object/prototype/__lookupGetter__/lookup-own-get-err.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-own-get-err.js
rename to test/built-ins/Object/prototype/__lookupGetter__/lookup-own-get-err.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-own-proto-err.js b/test/built-ins/Object/prototype/__lookupGetter__/lookup-own-proto-err.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-own-proto-err.js
rename to test/built-ins/Object/prototype/__lookupGetter__/lookup-own-proto-err.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-proto-acsr-w-getter.js b/test/built-ins/Object/prototype/__lookupGetter__/lookup-proto-acsr-w-getter.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-proto-acsr-w-getter.js
rename to test/built-ins/Object/prototype/__lookupGetter__/lookup-proto-acsr-w-getter.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-proto-acsr-wo-getter.js b/test/built-ins/Object/prototype/__lookupGetter__/lookup-proto-acsr-wo-getter.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-proto-acsr-wo-getter.js
rename to test/built-ins/Object/prototype/__lookupGetter__/lookup-proto-acsr-wo-getter.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-proto-data.js b/test/built-ins/Object/prototype/__lookupGetter__/lookup-proto-data.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-proto-data.js
rename to test/built-ins/Object/prototype/__lookupGetter__/lookup-proto-data.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-proto-get-err.js b/test/built-ins/Object/prototype/__lookupGetter__/lookup-proto-get-err.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-proto-get-err.js
rename to test/built-ins/Object/prototype/__lookupGetter__/lookup-proto-get-err.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-proto-proto-err.js b/test/built-ins/Object/prototype/__lookupGetter__/lookup-proto-proto-err.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupGetter__/lookup-proto-proto-err.js
rename to test/built-ins/Object/prototype/__lookupGetter__/lookup-proto-proto-err.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupGetter__/name.js b/test/built-ins/Object/prototype/__lookupGetter__/name.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupGetter__/name.js
rename to test/built-ins/Object/prototype/__lookupGetter__/name.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupGetter__/prop-desc.js b/test/built-ins/Object/prototype/__lookupGetter__/prop-desc.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupGetter__/prop-desc.js
rename to test/built-ins/Object/prototype/__lookupGetter__/prop-desc.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupGetter__/this-non-obj.js b/test/built-ins/Object/prototype/__lookupGetter__/this-non-obj.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupGetter__/this-non-obj.js
rename to test/built-ins/Object/prototype/__lookupGetter__/this-non-obj.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupSetter__/key-invalid.js b/test/built-ins/Object/prototype/__lookupSetter__/key-invalid.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupSetter__/key-invalid.js
rename to test/built-ins/Object/prototype/__lookupSetter__/key-invalid.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupSetter__/length.js b/test/built-ins/Object/prototype/__lookupSetter__/length.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupSetter__/length.js
rename to test/built-ins/Object/prototype/__lookupSetter__/length.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-not-found.js b/test/built-ins/Object/prototype/__lookupSetter__/lookup-not-found.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-not-found.js
rename to test/built-ins/Object/prototype/__lookupSetter__/lookup-not-found.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-own-acsr-w-setter.js b/test/built-ins/Object/prototype/__lookupSetter__/lookup-own-acsr-w-setter.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-own-acsr-w-setter.js
rename to test/built-ins/Object/prototype/__lookupSetter__/lookup-own-acsr-w-setter.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-own-acsr-wo-setter.js b/test/built-ins/Object/prototype/__lookupSetter__/lookup-own-acsr-wo-setter.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-own-acsr-wo-setter.js
rename to test/built-ins/Object/prototype/__lookupSetter__/lookup-own-acsr-wo-setter.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-own-data.js b/test/built-ins/Object/prototype/__lookupSetter__/lookup-own-data.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-own-data.js
rename to test/built-ins/Object/prototype/__lookupSetter__/lookup-own-data.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-own-get-err.js b/test/built-ins/Object/prototype/__lookupSetter__/lookup-own-get-err.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-own-get-err.js
rename to test/built-ins/Object/prototype/__lookupSetter__/lookup-own-get-err.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-own-proto-err.js b/test/built-ins/Object/prototype/__lookupSetter__/lookup-own-proto-err.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-own-proto-err.js
rename to test/built-ins/Object/prototype/__lookupSetter__/lookup-own-proto-err.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-proto-acsr-w-setter.js b/test/built-ins/Object/prototype/__lookupSetter__/lookup-proto-acsr-w-setter.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-proto-acsr-w-setter.js
rename to test/built-ins/Object/prototype/__lookupSetter__/lookup-proto-acsr-w-setter.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-proto-acsr-wo-setter.js b/test/built-ins/Object/prototype/__lookupSetter__/lookup-proto-acsr-wo-setter.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-proto-acsr-wo-setter.js
rename to test/built-ins/Object/prototype/__lookupSetter__/lookup-proto-acsr-wo-setter.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-proto-data.js b/test/built-ins/Object/prototype/__lookupSetter__/lookup-proto-data.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-proto-data.js
rename to test/built-ins/Object/prototype/__lookupSetter__/lookup-proto-data.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-proto-get-err.js b/test/built-ins/Object/prototype/__lookupSetter__/lookup-proto-get-err.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-proto-get-err.js
rename to test/built-ins/Object/prototype/__lookupSetter__/lookup-proto-get-err.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-proto-proto-err.js b/test/built-ins/Object/prototype/__lookupSetter__/lookup-proto-proto-err.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupSetter__/lookup-proto-proto-err.js
rename to test/built-ins/Object/prototype/__lookupSetter__/lookup-proto-proto-err.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupSetter__/name.js b/test/built-ins/Object/prototype/__lookupSetter__/name.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupSetter__/name.js
rename to test/built-ins/Object/prototype/__lookupSetter__/name.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupSetter__/prop-desc.js b/test/built-ins/Object/prototype/__lookupSetter__/prop-desc.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupSetter__/prop-desc.js
rename to test/built-ins/Object/prototype/__lookupSetter__/prop-desc.js
diff --git a/test/annexB/built-ins/Object/prototype/__lookupSetter__/this-non-obj.js b/test/built-ins/Object/prototype/__lookupSetter__/this-non-obj.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__lookupSetter__/this-non-obj.js
rename to test/built-ins/Object/prototype/__lookupSetter__/this-non-obj.js