diff --git a/bookshop/test/genres.http b/bookshop/test/genres.http
index a1eb770f..7849f11f 100644
--- a/bookshop/test/genres.http
+++ b/bookshop/test/genres.http
@@ -14,25 +14,24 @@ GET http://localhost:4004/odata/v4/test/Genres?
 POST http://localhost:4004/odata/v4/test/Genres?
 Content-Type: application/json
 
-{ "ID":100, "name":"Some Sample Genres...", "children":[
-    { "ID":101, "name":"Cat", "children":[
-        { "ID":102, "name":"Kitty", "children":[
-            { "ID":103, "name":"Kitty Cat", "children":[
-                { "ID":104, "name":"Aristocat" } ]},
-            { "ID":105, "name":"Kitty Bat" } ]},
-        { "ID":106, "name":"Catwoman", "children":[
-            { "ID":107, "name":"Catalina" } ]} ]},
-    { "ID":108, "name":"Catweazle" }
+{ "ID":"100aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", "name":"Some Sample Genres...", "children":[
+    { "ID":"101aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", "name":"Cat", "children":[
+        { "ID":"102aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", "name":"Kitty", "children":[
+            { "ID":"103aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", "name":"Aristocat" },
+            { "ID":"104aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", "name":"Kitty Bat" } ]},
+        { "ID":"105aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", "name":"Catwoman", "children":[
+            { "ID":"106aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", "name":"Catalina" } ]} ]},
+    { "ID":"107aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", "name":"Catweazle" }
 ]}
 ###
 
-GET http://localhost:4004/odata/v4/test/Genres(100)?
-# &$expand=children
-# &$expand=children($expand=children($expand=children($expand=children)))
+GET http://localhost:4004/odata/v4/test/Genres(100aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa)?
+&$expand=children
+&$expand=children($expand=children($expand=children($expand=children)))
 ###
 
-DELETE http://localhost:4004/odata/v4/test/Genres(103)
+DELETE http://localhost:4004/odata/v4/test/Genres(103aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa)
 ###
 
-DELETE http://localhost:4004/odata/v4/test/Genres(100)
+DELETE http://localhost:4004/odata/v4/test/Genres(100aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa)
 ###
diff --git a/bookshop/test/requests.http b/bookshop/test/requests.http
index cbd8faff..e4a52674 100644
--- a/bookshop/test/requests.http
+++ b/bookshop/test/requests.http
@@ -40,8 +40,7 @@ Authorization: Basic alice:
 
 {
   "ID": 112,
-  "name": "Shakespeeeeere",
-  "age": 22
+  "name": "Shakespeeeeere"
 }
 
 
@@ -56,7 +55,7 @@ Authorization: Basic alice:
   "title": "Poems : Pocket Poets",
   "descr": "The Everyman's Library Pocket Poets hardcover series is popular for its compact size and reasonable price which does not compromise content. Poems: Bronte contains poems that demonstrate a sensibility elemental in its force with an imaginative discipline and flexibility of the highest order. Also included are an Editor's Note and an index of first lines.",
   "author": { "ID": 101 },
-  "genre": { "ID": 12 },
+  "genre": { "ID": "12aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa" },
   "stock": 5,
   "price": "12.05",
   "currency": { "code": "USD" }