diff --git a/test/staging/upsert/Map/getOrInsert/append-new-values-normalizes-zero-key.js b/test/built-ins/Map/prototype/getOrInsert/append-new-values-normalizes-zero-key.js
similarity index 92%
rename from test/staging/upsert/Map/getOrInsert/append-new-values-normalizes-zero-key.js
rename to test/built-ins/Map/prototype/getOrInsert/append-new-values-normalizes-zero-key.js
index 27cc24e814..8bd8dac7e4 100644
--- a/test/staging/upsert/Map/getOrInsert/append-new-values-normalizes-zero-key.js
+++ b/test/built-ins/Map/prototype/getOrInsert/append-new-values-normalizes-zero-key.js
@@ -2,7 +2,7 @@
 // Copyright (C) 2024 Jonas Haukenes. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: proposal-upsert
+esid: sec-map.prototype.getorinsert
 description: |
   Append a new value in the map normalizing +0 and -0.
 info: |
@@ -16,7 +16,6 @@ info: |
   6. Append p to M.[[MapData]].
   ...
 features: [Symbol, upsert]
-flags: [noStrict]
 ---*/
 var map = new Map();
 map.getOrInsert(-0, 42);
@@ -25,4 +24,4 @@ assert.sameValue(map.get(0), 42);
 map = new Map();
 map.getOrInsert(+0, 43);
 assert.sameValue(map.get(0), 43);
-
+assert.sameValue(map.get(-0), 43);
diff --git a/test/staging/upsert/Map/getOrInsert/append-new-values.js b/test/built-ins/Map/prototype/getOrInsert/append-new-values.js
similarity index 96%
rename from test/staging/upsert/Map/getOrInsert/append-new-values.js
rename to test/built-ins/Map/prototype/getOrInsert/append-new-values.js
index 798f3be26b..24eb6d5a40 100644
--- a/test/staging/upsert/Map/getOrInsert/append-new-values.js
+++ b/test/built-ins/Map/prototype/getOrInsert/append-new-values.js
@@ -2,7 +2,7 @@
 // Copyright (C) 2024 Jonas Haukenes. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: proposal-upsert
+esid: sec-map.prototype.getorinsert
 description: |
   Append a new value as the last element of entries.
 info: |
@@ -16,7 +16,6 @@ info: |
   6. Append p to M.[[MapData]].
   ...
 features: [Symbol, upsert]
-flags: [noStrict]
 ---*/
 var s = Symbol(2);
 var map = new Map([[4, 4], ['foo3', 3], [s, 2]]);
diff --git a/test/staging/upsert/Map/getOrInsert/append-value-if-key-is-not-present-different-key-types.js b/test/built-ins/Map/prototype/getOrInsert/append-value-if-key-is-not-present-different-key-types.js
similarity index 96%
rename from test/staging/upsert/Map/getOrInsert/append-value-if-key-is-not-present-different-key-types.js
rename to test/built-ins/Map/prototype/getOrInsert/append-value-if-key-is-not-present-different-key-types.js
index e139c10666..7a02424052 100644
--- a/test/staging/upsert/Map/getOrInsert/append-value-if-key-is-not-present-different-key-types.js
+++ b/test/built-ins/Map/prototype/getOrInsert/append-value-if-key-is-not-present-different-key-types.js
@@ -2,7 +2,7 @@
 // Copyright (C) 2024 Sune Eriksson Lianes. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: proposal-upsert
+esid: sec-map.prototype.getorinsert
 description: |
   Inserts the value for the specified key on different types, when key not present.
 info: |
@@ -13,7 +13,6 @@ info: |
   6. Append p to M.[[MapData]].
   ...
 features: [Symbol, upsert]
-flags: [noStrict]
 ---*/
 var map = new Map();
 
diff --git a/test/staging/upsert/Map/getOrInsert/does-not-have-mapdata-internal-slot-set.js b/test/built-ins/Map/prototype/getOrInsert/does-not-have-mapdata-internal-slot-set.js
similarity index 94%
rename from test/staging/upsert/Map/getOrInsert/does-not-have-mapdata-internal-slot-set.js
rename to test/built-ins/Map/prototype/getOrInsert/does-not-have-mapdata-internal-slot-set.js
index 502dd022b3..546add11d8 100644
--- a/test/staging/upsert/Map/getOrInsert/does-not-have-mapdata-internal-slot-set.js
+++ b/test/built-ins/Map/prototype/getOrInsert/does-not-have-mapdata-internal-slot-set.js
@@ -2,7 +2,7 @@
 // Copyright (C) 2024 Sune Eriksson Lianes. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: proposal-upsert
+esid: sec-map.prototype.getorinsert
 description: |
   Throws a TypeError if `this` is a Set Object
 info: |
@@ -13,7 +13,6 @@ info: |
   2. Perform ? RequireInternalSlot(M, [[MapData]])
   ...
 features: [Set, upsert]
-flags: [noStrict]
 ---*/
 assert.throws(TypeError, function () {
   Map.prototype.getOrInsert.call(new Set(), 1, 1);
diff --git a/test/staging/upsert/Map/getOrInsert/does-not-have-mapdata-internal-slot-weakmap.js b/test/built-ins/Map/prototype/getOrInsert/does-not-have-mapdata-internal-slot-weakmap.js
similarity index 94%
rename from test/staging/upsert/Map/getOrInsert/does-not-have-mapdata-internal-slot-weakmap.js
rename to test/built-ins/Map/prototype/getOrInsert/does-not-have-mapdata-internal-slot-weakmap.js
index b661b72316..8429b2e6a0 100644
--- a/test/staging/upsert/Map/getOrInsert/does-not-have-mapdata-internal-slot-weakmap.js
+++ b/test/built-ins/Map/prototype/getOrInsert/does-not-have-mapdata-internal-slot-weakmap.js
@@ -2,7 +2,7 @@
 // Copyright (C) 2024 Sune Eriksson Lianes. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: proposal-upsert
+esid: sec-map.prototype.getorinsert
 description: |
   Throws a TypeError if `this` is a WeakMap object.
 info: |
@@ -13,7 +13,6 @@ info: |
   2. Perform ? RequireInternalSlot(M, [[MapData]]).
   ...
 features: [WeakMap, upsert]
-flags: [noStrict]
 ---*/
 assert.throws(TypeError, function() {
   Map.prototype.getOrInsert.call(new WeakMap(), 1, 1);
diff --git a/test/staging/upsert/Map/getOrInsert/does-not-have-mapdata-internal-slot.js b/test/built-ins/Map/prototype/getOrInsert/does-not-have-mapdata-internal-slot.js
similarity index 95%
rename from test/staging/upsert/Map/getOrInsert/does-not-have-mapdata-internal-slot.js
rename to test/built-ins/Map/prototype/getOrInsert/does-not-have-mapdata-internal-slot.js
index 0de1134cab..b87c09b864 100644
--- a/test/staging/upsert/Map/getOrInsert/does-not-have-mapdata-internal-slot.js
+++ b/test/built-ins/Map/prototype/getOrInsert/does-not-have-mapdata-internal-slot.js
@@ -2,7 +2,7 @@
 // Copyright (C) 2024 Sune Eriksson Lianes. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: proposal-upsert
+esid: sec-map.prototype.getorinsert
 description: |
   Throws a TypeError if `this` object does not have a [[MapData]] internal slot.
 info: |
@@ -13,7 +13,6 @@ info: |
   2. Perform ? RequireInternalSLot(M, [[MapData]])
   ...
 features: [upsert]
-flags: [noStrict]
 ---*/
 var map = new Map();
 
diff --git a/test/staging/upsert/Map/getOrInsert/getOrInsert.js b/test/built-ins/Map/prototype/getOrInsert/getOrInsert.js
similarity index 94%
rename from test/staging/upsert/Map/getOrInsert/getOrInsert.js
rename to test/built-ins/Map/prototype/getOrInsert/getOrInsert.js
index 363557ca45..799f66a645 100644
--- a/test/staging/upsert/Map/getOrInsert/getOrInsert.js
+++ b/test/built-ins/Map/prototype/getOrInsert/getOrInsert.js
@@ -2,7 +2,7 @@
 // Copyright (C) 2024 Jonas Haukenes. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: proposal-upsert
+esid: sec-map.prototype.getorinsert
 description: |
   Property type and descriptor.
 info: |
@@ -11,7 +11,6 @@ info: |
   17 ECMAScript Standard Built-in Objects
 includes: [propertyHelper.js]
 features: [upsert]
-flags: [noStrict]
 ---*/
 assert.sameValue(
   typeof Map.prototype.getOrInsert,
diff --git a/test/staging/upsert/Map/getOrInsert/length.js b/test/built-ins/Map/prototype/getOrInsert/length.js
similarity index 93%
rename from test/staging/upsert/Map/getOrInsert/length.js
rename to test/built-ins/Map/prototype/getOrInsert/length.js
index 1e449d67cc..f3211fc9c5 100644
--- a/test/staging/upsert/Map/getOrInsert/length.js
+++ b/test/built-ins/Map/prototype/getOrInsert/length.js
@@ -2,7 +2,7 @@
 // Copyright (C) 2024 Jonas Haukenes. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: proposal-upsert
+esid: sec-map.prototype.getorinsert
 description: |
   Map.prototype.getOrInsert.length value and descriptor.
 info: |
@@ -11,7 +11,6 @@ info: |
   17 ECMAScript Standard Built-in Objects
 includes: [propertyHelper.js]
 features: [upsert]
-flags: [noStrict]
 ---*/
 verifyProperty(Map.prototype.getOrInsert, "length", {
   value: 2,
diff --git a/test/staging/upsert/Map/getOrInsert/name.js b/test/built-ins/Map/prototype/getOrInsert/name.js
similarity index 93%
rename from test/staging/upsert/Map/getOrInsert/name.js
rename to test/built-ins/Map/prototype/getOrInsert/name.js
index 1063008ee9..a7bf432346 100644
--- a/test/staging/upsert/Map/getOrInsert/name.js
+++ b/test/built-ins/Map/prototype/getOrInsert/name.js
@@ -2,7 +2,7 @@
 // Copyright (C) 2024 Jonas Haukenes. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: proposal-upsert
+esid: sec-map.prototype.getorinsert
 description: |
   Map.prototype.getOrInsert.name value and descriptor.
 info: |
@@ -11,7 +11,6 @@ info: |
   17 ECMAScript Standard Built-in Objects
 includes: [propertyHelper.js]
 features: [upsert]
-flags: [noStrict]
 ---*/
 verifyProperty(Map.prototype.getOrInsert, "name", {
   value: "getOrInsert",
diff --git a/test/staging/upsert/Map/getOrInsert/not-a-constructor.js b/test/built-ins/Map/prototype/getOrInsert/not-a-constructor.js
similarity index 95%
rename from test/staging/upsert/Map/getOrInsert/not-a-constructor.js
rename to test/built-ins/Map/prototype/getOrInsert/not-a-constructor.js
index ae6d0e807f..2bdd85299c 100644
--- a/test/staging/upsert/Map/getOrInsert/not-a-constructor.js
+++ b/test/built-ins/Map/prototype/getOrInsert/not-a-constructor.js
@@ -3,7 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: proposal-upsert
+esid: sec-map.prototype.getorinsert
 description: |
   Map.prototype.getOrInsert does not implement [[Construct]], is not new-able
 info: |
@@ -20,7 +20,6 @@ info: |
   ...
 includes: [isConstructor.js]
 features: [Map, Reflect.construct, arrow-function, upsert]
-flags: [noStrict]
 ---*/
 assert.sameValue(isConstructor(Map.prototype.getOrInsert), false, 'isConstructor(Map.prototype.getOrInsert) must return false');
 
diff --git a/test/staging/upsert/Map/getOrInsert/returns-value-if-key-is-not-present-different-key-types.js b/test/built-ins/Map/prototype/getOrInsert/returns-value-if-key-is-not-present-different-key-types.js
similarity index 96%
rename from test/staging/upsert/Map/getOrInsert/returns-value-if-key-is-not-present-different-key-types.js
rename to test/built-ins/Map/prototype/getOrInsert/returns-value-if-key-is-not-present-different-key-types.js
index 632e5dfc1a..2d07b52e2f 100644
--- a/test/staging/upsert/Map/getOrInsert/returns-value-if-key-is-not-present-different-key-types.js
+++ b/test/built-ins/Map/prototype/getOrInsert/returns-value-if-key-is-not-present-different-key-types.js
@@ -2,7 +2,7 @@
 // Copyright (C) 2024 Jonas Haukenes. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: proposal-upsert
+esid: sec-map.prototype.getorinsert
 description: |
   Returns the value from the specified key on different types, when key not present.
 info: |
@@ -14,7 +14,6 @@ info: |
   7. Return p.[[Value]].
   ...
 features: [Symbol, upsert]
-flags: [noStrict]
 ---*/
 var map = new Map();
 
diff --git a/test/staging/upsert/Map/getOrInsert/returns-value-if-key-is-present-different-key-types.js b/test/built-ins/Map/prototype/getOrInsert/returns-value-if-key-is-present-different-key-types.js
similarity index 97%
rename from test/staging/upsert/Map/getOrInsert/returns-value-if-key-is-present-different-key-types.js
rename to test/built-ins/Map/prototype/getOrInsert/returns-value-if-key-is-present-different-key-types.js
index 5fbd65bcdb..fdbf686690 100644
--- a/test/staging/upsert/Map/getOrInsert/returns-value-if-key-is-present-different-key-types.js
+++ b/test/built-ins/Map/prototype/getOrInsert/returns-value-if-key-is-present-different-key-types.js
@@ -2,7 +2,7 @@
 // Copyright (C) 2024 Sune Eriksson Lianes. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: proposal-upsert
+esid: sec-map.prototype.getorinsert
 description: |
   Returns the value set before getOrInsert from the specified key on different types.
 info: |
@@ -13,7 +13,6 @@ info: |
     a. If p.[[Key]] is not empty and SameValue(p.[[Key]], key) is true, return p.[[Value]].
   ...
 features: [Symbol, upsert]
-flags: [noStrict]
 ---*/
 var map = new Map();
 
diff --git a/test/staging/upsert/Map/getOrInsert/returns-value-normalized-zero-key.js b/test/built-ins/Map/prototype/getOrInsert/returns-value-normalized-zero-key.js
similarity index 94%
rename from test/staging/upsert/Map/getOrInsert/returns-value-normalized-zero-key.js
rename to test/built-ins/Map/prototype/getOrInsert/returns-value-normalized-zero-key.js
index 4d03e3e8a4..c71122c7ca 100644
--- a/test/staging/upsert/Map/getOrInsert/returns-value-normalized-zero-key.js
+++ b/test/built-ins/Map/prototype/getOrInsert/returns-value-normalized-zero-key.js
@@ -2,7 +2,7 @@
 // Copyright (C) 2024 Jonas Haukenes. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: proposal-upsert
+esid: sec-map.prototype.getorinsert
 description: |
   Returns the value from the specified key normalizing +0 and -0.
 info: |
@@ -13,7 +13,6 @@ info: |
     a. If p.[[Key]] is not empty and SameValue(p.[[Key]], key) is true, return p.[[Value]].
   ...
 features: [upsert]
-flags: [noStrict]
 ---*/
 var map = new Map();
 
diff --git a/test/staging/upsert/Map/getOrInsert/this-not-object-throw.js b/test/built-ins/Map/prototype/getOrInsert/this-not-object-throw.js
similarity index 95%
rename from test/staging/upsert/Map/getOrInsert/this-not-object-throw.js
rename to test/built-ins/Map/prototype/getOrInsert/this-not-object-throw.js
index 6a00fa8f9d..cacb911b35 100644
--- a/test/staging/upsert/Map/getOrInsert/this-not-object-throw.js
+++ b/test/built-ins/Map/prototype/getOrInsert/this-not-object-throw.js
@@ -2,7 +2,7 @@
 // Copyright (C) 2024 Sune Eriksson Lianes. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: proposal-upsert
+esid: sec-map.prototype.getorinsert
 description: |
   Throws a TypeError if `this` is not an Object.
 info: |
@@ -12,7 +12,6 @@ info: |
   2. Perform ? RequireInternalSlot(M, [[MapData]])
   ...
 features: [Symbol, upsert]
-flags: [noStrict]
 ---*/
 var m = new Map();