diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/exception-not-object-coercible.js b/test/built-ins/Object/getOwnPropertyDescriptors/exception-not-object-coercible.js
index 1b7ae316c9..0bfc62bd4c 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/exception-not-object-coercible.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/exception-not-object-coercible.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors should fail if given a null or undefined value
-es7id: pending
+esid: pending
 author: Jordan Harband
 ---*/
 
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/function-length.js b/test/built-ins/Object/getOwnPropertyDescriptors/function-length.js
index 7746b98bb7..91e531bf06 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/function-length.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/function-length.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors should have length 1
-es7id: pending
+esid: pending
 author: Jordan Harband
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/function-name.js b/test/built-ins/Object/getOwnPropertyDescriptors/function-name.js
index 6a6243f50a..ef16cf4d6d 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/function-name.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/function-name.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors should have name property with value 'getOwnPropertyDescriptors'
-es7id: pending
+esid: pending
 author: Jordan Harband
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/function-property-descriptor.js b/test/built-ins/Object/getOwnPropertyDescriptors/function-property-descriptor.js
index 1830cadf7c..170b1cb9e0 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/function-property-descriptor.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/function-property-descriptor.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors should be writable, non-enumerable, and configurable
-es7id: pending
+esid: pending
 author: Jordan Harband
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/inherited-properties-omitted.js b/test/built-ins/Object/getOwnPropertyDescriptors/inherited-properties-omitted.js
index 6dd82d8d69..c19d40c59a 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/inherited-properties-omitted.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/inherited-properties-omitted.js
@@ -3,16 +3,17 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors does not see inherited properties.
-es7id: pending
+esid: pending
 author: Jordan Harband
 ---*/
 
-var F = function G() {};
+var F = function () {};
 F.prototype.a = {};
 F.prototype.b = {};
 
 var f = new F();
-f.b = {}; // shadow the prototype
+var bValue = {};
+f.b = bValue; // shadow the prototype
 Object.defineProperty(f, 'c', {
   enumerable: false,
   configurable: true,
@@ -28,15 +29,15 @@ assert.sameValue(!!result.c, true, 'c has a descriptor');
 assert.sameValue(result.b.enumerable, true, 'b is enumerable');
 assert.sameValue(result.b.configurable, true, 'b is configurable');
 assert.sameValue(result.b.writable, true, 'b is writable');
-assert.sameValue(result.b.value, f.b, 'b’s value is f.b');
+assert.sameValue(result.b.value, bValue, 'b’s value is `bValue`');
 
 assert.sameValue(result.c.enumerable, false, 'c is enumerable');
 assert.sameValue(result.c.configurable, true, 'c is configurable');
 assert.sameValue(result.c.writable, false, 'c is writable');
-assert.sameValue(result.c.value, f.c, 'c’s value is f.c');
+assert.sameValue(result.c.value, f.c, 'c’s value is `f.c`');
 
 assert.sameValue(
   Object.keys(result).length,
-  Object.getOwnPropertyNames(f).length,
+  2,
   'result has same number of own property names as f'
 );
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/normal-object.js b/test/built-ins/Object/getOwnPropertyDescriptors/normal-object.js
new file mode 100644
index 0000000000..8ef7f8c5c2
--- /dev/null
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/normal-object.js
@@ -0,0 +1,13 @@
+// Copyright (C) 2016 Jordan Harband. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+description: Object.getOwnPropertyDescriptors should produce a normal object inheriting from Object.prototype
+esid: pending
+author: Jordan Harband
+---*/
+
+assert.sameValue(
+  Object.getPrototypeOf(Object.getOwnPropertyDescriptors({})),
+  Object.prototype
+);
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/observable-operations.js b/test/built-ins/Object/getOwnPropertyDescriptors/observable-operations.js
index 752f914ea9..534cf759a7 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/observable-operations.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/observable-operations.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors should perform observable operations in the correct order
-es7id: pending
+esid: pending
 author: Jordan Harband
 features: [Proxy]
 ---*/
@@ -42,4 +42,4 @@ var check = {
 };
 var proxy = new Proxy(object, new Proxy(handler, check));
 var result = Object.getOwnPropertyDescriptors(proxy);
-assert.sameValue(log, "|ownKeys|getOwnPropertyDescriptor:a|getOwnPropertyDescriptor:b|getOwnPropertyDescriptor:c", log);
+assert.sameValue(log, "|ownKeys|getOwnPropertyDescriptor:a|getOwnPropertyDescriptor:b|getOwnPropertyDescriptor:c", 'log');
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/primitive-booleans.js b/test/built-ins/Object/getOwnPropertyDescriptors/primitive-booleans.js
index bb136c4bfb..899aaa0e58 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/primitive-booleans.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/primitive-booleans.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors accepts boolean primitives.
-es7id: pending
+esid: pending
 author: Jordan Harband
 ---*/
 
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/primitive-numbers.js b/test/built-ins/Object/getOwnPropertyDescriptors/primitive-numbers.js
index 93d1ae7e64..495796ae4d 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/primitive-numbers.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/primitive-numbers.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors accepts number primitives.
-es7id: pending
+esid: pending
 author: Jordan Harband
 ---*/
 
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/primitive-strings.js b/test/built-ins/Object/getOwnPropertyDescriptors/primitive-strings.js
index a5f59ca171..c8d3be9ec7 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/primitive-strings.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/primitive-strings.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors accepts string primitives.
-es7id: pending
+esid: pending
 author: Jordan Harband
 ---*/
 
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/primitive-symbols.js b/test/built-ins/Object/getOwnPropertyDescriptors/primitive-symbols.js
index cbc5e825d2..d30fa3f464 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/primitive-symbols.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/primitive-symbols.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors accepts Symbol primitives.
-es7id: pending
+esid: pending
 author: Jordan Harband
 features: [Symbol]
 ---*/
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/symbols-omitted.js b/test/built-ins/Object/getOwnPropertyDescriptors/symbols-included.js
similarity index 94%
rename from test/built-ins/Object/getOwnPropertyDescriptors/symbols-omitted.js
rename to test/built-ins/Object/getOwnPropertyDescriptors/symbols-included.js
index 6cd608db2a..61c067629c 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/symbols-omitted.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/symbols-included.js
@@ -2,8 +2,8 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-description: Object.getOwnPropertyDescriptors does not include Symbol keys.
-es7id: pending
+description: Object.getOwnPropertyDescriptors includes Symbol keys.
+esid: pending
 author: Jordan Harband
 features: [Symbol]
 ---*/
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/tamper-with-global-object.js b/test/built-ins/Object/getOwnPropertyDescriptors/tamper-with-global-object.js
index d09d1872fb..e344e3e994 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/tamper-with-global-object.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/tamper-with-global-object.js
@@ -4,8 +4,9 @@
 /*---
 description: >
     Object.getOwnPropertyDescriptors should not have its behavior impacted by modifications to the global property Object
-es7id: pending
+esid: pending
 author: Jordan Harband
+includes: [fnGlobalObject.js]
 ---*/
 
 function fakeObject() {
@@ -14,7 +15,7 @@ function fakeObject() {
 fakeObject.getOwnPropertyDescriptors = Object.getOwnPropertyDescriptors;
 fakeObject.keys = Object.keys;
 
-var global = Function('return this;')();
+var global = fnGlobalObject();
 global.Object = fakeObject;
 
 assert.sameValue(Object, fakeObject, 'Sanity check failed: could not modify the global Object');
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/tamper-with-object-keys.js b/test/built-ins/Object/getOwnPropertyDescriptors/tamper-with-object-keys.js
index 1c6c4cf834..1f4d698936 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/tamper-with-object-keys.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/tamper-with-object-keys.js
@@ -4,7 +4,7 @@
 /*---
 description: >
     Object.getOwnPropertyDescriptors should not have its behavior impacted by modifications to Object.getOwnPropertyDescriptor
-es7id: pending
+esid: pending
 author: Jordan Harband
 ---*/