diff --git a/.github/ISSUE_TEMPLATE/question--feedback-or-bug-.md b/.github/ISSUE_TEMPLATE/question--feedback-or-bug-.md
new file mode 100644
index 00000000..19f10800
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question--feedback-or-bug-.md
@@ -0,0 +1,10 @@
+---
+name: Question, feedback or bug?
+about: Use our community!
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Please use our community on https://answers.sap.com/tags/9f13aee1-834c-4105-8e43-ee442775e5ce
diff --git a/.mocharc.yml b/.mocharc.yml
new file mode 100644
index 00000000..06f6886f
--- /dev/null
+++ b/.mocharc.yml
@@ -0,0 +1 @@
+parallel: true
diff --git a/.npmrc b/.npmrc
deleted file mode 100644
index 6041b7e8..00000000
--- a/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-@sap:registry=https://npm.sap.com
\ No newline at end of file
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index dcc16d69..240b1cf9 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -4,7 +4,7 @@
 
 	// List of extensions which should be recommended for users of this workspace.
 	"recommendations": [
-		// "CDS Editor !",
+		"SAPSE.vscode-cds",
 		"dbaeumer.vscode-eslint",
 		"esbenp.prettier-vscode",
 		"mechatroner.rainbow-csv",
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 37d9ac7f..d0f0e8eb 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -6,24 +6,16 @@
   "configurations": [
     {
       "name": "bookshop",
-      "cwd": "${workspaceFolder}/bookshop",
+      "command": "cds watch bookshop",
       "request": "launch",
-      "type": "node",
-      "runtimeExecutable": "npx",
-      "runtimeArgs": ["-n"],
-      "args": ["--", "cds", "run", "--with-mocks", "--in-memory?"],
-      "console": "integratedTerminal",
+      "type": "node-terminal",
       "skipFiles": ["<node_internals>/**"]
     },
     {
-      "name": "Fiori App",
-      "cwd": "${workspaceFolder}/fiori",
+      "name": "Fiori app",
+      "command": "cds watch fiori",
       "request": "launch",
-      "type": "node",
-      "runtimeExecutable": "npx",
-      "runtimeArgs": ["-n"],
-      "args": ["--", "cds", "run", "--with-mocks", "--in-memory?"],
-      "console": "integratedTerminal",
+      "type": "node-terminal",
       "skipFiles": ["<node_internals>/**"]
     }
   ],
diff --git a/README.md b/README.md
index 294f3191..dd41eff5 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ npx jest
 ## Get Support
 
 Check out the documentation at [https://cap.cloud.sap](https://cap.cloud.sap). <br>
-In case you find a bug or need support, please [open an issue in here](https://github.com/SAP-samples/cloud-cap-samples/issues/new).
+In case you have a question, find a bug, or otherwise need support, please use our [community](https://answers.sap.com/tags/9f13aee1-834c-4105-8e43-ee442775e5ce).
 
 
 ## License
diff --git a/bookshop/db/data/sap.capire.bookshop-Genres.csv b/bookshop/db/data/sap.capire.bookshop-Genres.csv
index 08435ca9..1ea3793b 100644
--- a/bookshop/db/data/sap.capire.bookshop-Genres.csv
+++ b/bookshop/db/data/sap.capire.bookshop-Genres.csv
@@ -11,6 +11,6 @@ ID;parent_ID;name
 19;10;Fairy Tale
 20;;Non-Fiction
 21;20;Biography
-22;20;Autobiography
+22;21;Autobiography
 23;20;Essay
 24;20;Speech
diff --git a/common/data/sap.common-Currencies.csv b/common/data/sap.common-Currencies.csv
index 63372602..efe4538e 100644
--- a/common/data/sap.common-Currencies.csv
+++ b/common/data/sap.common-Currencies.csv
@@ -2,7 +2,7 @@ code;symbol;name;descr;numcode;minor;exponent
 EUR;€;Euro;European Euro;978;Cent;2
 USD;$;US Dollar;United States Dollar;840;Cent;2
 CAD;$;Canadian Dollar;Canadian Dollar;124;Cent;2
-AUD;$;Australian Dollar;Canadian Dollar;036;Cent;2
+AUD;$;Australian Dollar;Australian Dollar;036;Cent;2
 GBP;£;British Pound;Great Britain Pound;826;Penny;2
 ILS;₪;Shekel;Israeli New Shekel;376;Agorat;2
 INR;₹;Rupee;Indian Rupee;356;Paise;2
diff --git a/fiori/app/_i18n/i18n.properties b/fiori/app/_i18n/i18n.properties
index 5d6f03d6..c1d0293f 100644
--- a/fiori/app/_i18n/i18n.properties
+++ b/fiori/app/_i18n/i18n.properties
@@ -7,7 +7,19 @@ AuthorID = Author ID
 Stock = Stock
 Name = Name
 AuthorName = Author's Name
+DateOfBirth = Date of Birth
+DateOfDeath = Date of Death
+PlaceOfBirth = Place of Birth
+PlaceOfDeath = Place of Death
 Authors = Authors
 Order = Order
 Orders = Orders
 Price = Price
+
+Genre = Genre
+Genres = Genres
+SubGenres = Sub Genres
+
+NumCode = Numeric Code
+MinorUnit = Minor Unit
+Exponent = Exponent
\ No newline at end of file
diff --git a/fiori/app/admin/webapp/Component.js b/fiori/app/admin/webapp/Component.js
index 18967b84..c3137017 100644
--- a/fiori/app/admin/webapp/Component.js
+++ b/fiori/app/admin/webapp/Component.js
@@ -1,5 +1,8 @@
-sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("admin.Component", {
-    metadata:{ manifest:'json' }
-}))
+sap.ui.define(["sap/fe/core/AppComponent"], function(AppComponent) {
+	"use strict";
+	return AppComponent.extend("admin.Component", {
+		metadata: { manifest: "json" }
+	});
+});
 
 /* eslint no-undef:0 */
\ No newline at end of file
diff --git a/fiori/app/admin/webapp/manifest.json b/fiori/app/admin/webapp/manifest.json
index 574480f1..25047c29 100644
--- a/fiori/app/admin/webapp/manifest.json
+++ b/fiori/app/admin/webapp/manifest.json
@@ -24,7 +24,7 @@
     "sap.ui5": {
         "dependencies": {
             "libs": {
-                "sap.fe": {}
+                "sap.fe.templates": {}
             }
         },
         "models": {
diff --git a/fiori/app/browse/webapp/Component.js b/fiori/app/browse/webapp/Component.js
index 0d8d14b5..7914d295 100644
--- a/fiori/app/browse/webapp/Component.js
+++ b/fiori/app/browse/webapp/Component.js
@@ -1,5 +1,7 @@
-sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("bookshop.Component", {
-    metadata:{ manifest:'json' }
-}))
-
+sap.ui.define(["sap/fe/core/AppComponent"], function(AppComponent) {
+	"use strict";
+	return AppComponent.extend("bookshop.Component", {
+		metadata: { manifest: "json" }
+	});
+});
 /* eslint no-undef:0 */
\ No newline at end of file
diff --git a/fiori/app/browse/webapp/manifest.json b/fiori/app/browse/webapp/manifest.json
index 4212312e..4a2e0a62 100644
--- a/fiori/app/browse/webapp/manifest.json
+++ b/fiori/app/browse/webapp/manifest.json
@@ -24,7 +24,7 @@
   "sap.ui5": {
     "dependencies": {
       "libs": {
-        "sap.fe": {}
+        "sap.fe.templates": {}
       }
     },
     "models": {
diff --git a/fiori/app/common.cds b/fiori/app/common.cds
index 2cbdd162..614f03b3 100644
--- a/fiori/app/common.cds
+++ b/fiori/app/common.cds
@@ -1,9 +1,9 @@
 /*
-  Common Annotations shared by all apps
+	Common Annotations shared by all apps
 */
 
 using { sap.capire.bookshop as my } from '@capire/bookshop';
-
+using { sap.common } from '@capire/common';
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -13,7 +13,7 @@ annotate my.Books with @(
 	Common.SemanticKey: [title],
 	UI: {
 		Identification: [{Value:title}],
-	  SelectionFields: [ ID, author_ID, price, currency_code ],
+		SelectionFields: [ ID, author_ID, price, currency_code ],
 		LineItem: [
 			{Value: ID},
 			{Value: title},
@@ -28,25 +28,18 @@ annotate my.Books with @(
 	author @ValueList.entity:'Authors';
 };
 
-annotate my.Authors with @(
-	UI: {
-		Identification: [{Value:name}],
-	}
-);
-
-
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Details
 //
 annotate my.Books with @(
 	UI: {
-  	HeaderInfo: {
-  		TypeName: '{i18n>Book}',
-  		TypeNamePlural: '{i18n>Books}',
-  		Title: {Value: title},
-  		Description: {Value: author.name}
-  	},
+		HeaderInfo: {
+			TypeName: '{i18n>Book}',
+			TypeNamePlural: '{i18n>Books}',
+			Title: {Value: title},
+			Description: {Value: author.name}
+		},
 	}
 );
 
@@ -66,15 +59,199 @@ annotate my.Books with {
 	descr @UI.MultiLineText;
 }
 
+////////////////////////////////////////////////////////////////////////////
+//
+//	Genres List
+//
+annotate my.Genres with @(
+	Common.SemanticKey: [name],
+	UI: {
+		SelectionFields: [ name ],
+		LineItem:[
+			{Value: name},
+			{Value: parent.name, Label: 'Main Genre'},
+		],
+	}
+);
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Genre Details
+//
+annotate my.Genres with @(
+	UI: {
+		Identification: [{Value:name}],
+		HeaderInfo: {
+			TypeName: '{i18n>Genre}',
+			TypeNamePlural: '{i18n>Genres}',
+			Title: {Value: name},
+			Description: {Value: ID}
+		},
+		Facets: [
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>SubGenres}', Target: 'children/@UI.LineItem'},
+		],
+	}
+);
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Genres Elements
+//
 annotate my.Genres with {
-  name  @title: '{i18n>Genre}';
+	ID  @title: '{i18n>ID}';
+	name  @title: '{i18n>Genre}';
 }
 
+////////////////////////////////////////////////////////////////////////////
+//
+//	Authors List
+//
+annotate my.Authors with @(
+	Common.SemanticKey: [name],
+	UI: {
+		Identification: [{Value:name}],
+		SelectionFields: [ name ],
+		LineItem:[
+			{Value: ID},
+			{Value: name},
+			{Value: dateOfBirth},
+			{Value: dateOfDeath},
+			{Value: placeOfBirth},
+			{Value: placeOfDeath},
+		],
+	}
+);
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Author Details
+//
+annotate my.Authors with @(
+	UI: {
+		HeaderInfo: {
+			TypeName: '{i18n>Author}',
+			TypeNamePlural: '{i18n>Authors}',
+			Title: {Value: name},
+			Description: {Value: dateOfBirth}
+		},
+		Facets: [
+			{$Type: 'UI.ReferenceFacet', Target: 'books/@UI.LineItem'},
+		],
+	}
+);
+
+
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Authors Elements
 //
 annotate my.Authors with {
 	ID @title:'{i18n>ID}' @UI.HiddenFilter;
-	name @title:'{i18n>AuthorName}';
+	name @title:'{i18n>Name}';
+	dateOfBirth @title:'{i18n>DateOfBirth}';
+	dateOfDeath @title:'{i18n>DateOfDeath}';
+	placeOfBirth @title:'{i18n>PlaceOfBirth}';
+	placeOfDeath @title:'{i18n>PlaceOfDeath}';
+}
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Languages List
+//
+annotate common.Languages with @(
+	Common.SemanticKey: [code],
+	Identification: [{Value:code}],
+	UI: {
+		SelectionFields: [ name, descr ],
+		LineItem:[
+			{Value: code},
+			{Value: name},
+		],
+	}
+);
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Language Details
+//
+annotate common.Languages with @(
+	UI: {
+		HeaderInfo: {
+			TypeName: '{i18n>Language}',
+			TypeNamePlural: '{i18n>Languages}',
+			Title: {Value: name},
+			Description: {Value: descr}
+		},
+		Facets: [
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
+		],
+		FieldGroup#Details: {
+			Data: [
+				{Value: code},
+				{Value: name},
+				{Value: descr}
+			]
+		},
+	}
+);
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Currencies List
+//
+annotate common.Currencies with @(
+	Common.SemanticKey: [code],
+	Identification: [{Value:code}],
+	UI: {
+		SelectionFields: [ name, descr ],
+		LineItem:[
+			{Value: descr},
+			{Value: symbol},
+			{Value: code},
+		],
+	}
+);
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Currency Details
+//
+annotate common.Currencies with @(
+	UI: {
+		HeaderInfo: {
+			TypeName: '{i18n>Currency}',
+			TypeNamePlural: '{i18n>Currencies}',
+			Title: {Value: descr},
+			Description: {Value: code}
+		},
+		Facets: [
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Extended}', Target: '@UI.FieldGroup#Extended'},
+		],
+		FieldGroup#Details: {
+			Data: [
+				{Value: name},
+				{Value: symbol},
+				{Value: code},
+				{Value: descr}
+			]
+		},
+		FieldGroup#Extended: {
+			Data: [
+				{Value: numcode},
+				{Value: minor},
+				{Value: exponent}
+			]
+		},
+	}
+);
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Currencies Elements
+//
+annotate common.Currencies with {
+	numcode @title:'{i18n>NumCode}';
+	minor @title:'{i18n>MinorUnit}';
+	exponent @title:'{i18n>Exponent}';
 }
diff --git a/fiori/app/fiori.html b/fiori/app/fiori.html
index 26182c12..aec60a55 100644
--- a/fiori/app/fiori.html
+++ b/fiori/app/fiori.html
@@ -40,7 +40,8 @@
 	</script>
 
 	<script src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
+	<!-- <script src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js" -->
+	<script src="https://sapui5.hana.ondemand.com/1.78.6/resources/sap-ui-core.js"
     	data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
     	data-sap-ui-compatVersion="edge"
     	data-sap-ui-theme="sap_fiori_3"
diff --git a/fiori/app/orders/webapp/Component.js b/fiori/app/orders/webapp/Component.js
index 82388965..dff3acbc 100644
--- a/fiori/app/orders/webapp/Component.js
+++ b/fiori/app/orders/webapp/Component.js
@@ -1,5 +1,8 @@
-sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("orders.Component", {
-    metadata:{ manifest:'json' }
-}))
+sap.ui.define(["sap/fe/core/AppComponent"], function(AppComponent) {
+	"use strict";
+	return AppComponent.extend("orders.Component", {
+		metadata: { manifest: "json" }
+	});
+});
 
 /* eslint no-undef:0 */
\ No newline at end of file
diff --git a/fiori/app/orders/webapp/manifest.json b/fiori/app/orders/webapp/manifest.json
index ce659ec2..df686462 100644
--- a/fiori/app/orders/webapp/manifest.json
+++ b/fiori/app/orders/webapp/manifest.json
@@ -24,7 +24,7 @@
 	"sap.ui5": {
         "dependencies": {
             "libs": {
-                "sap.fe": {}
+                "sap.fe.templates": {}
             }
         },
 		"models": {
diff --git a/orders/srv/orders-service.js b/orders/srv/orders-service.js
index 55d0e1ba..bc401fd4 100644
--- a/orders/srv/orders-service.js
+++ b/orders/srv/orders-service.js
@@ -6,14 +6,14 @@ module.exports = cds.service.impl(function() {
 
   // Reduce stock of ordered books if available stock suffices
   this.before ('CREATE', 'Orders', (req) => {
-    const { Items: OrderItems } = req.data
-    return cds.transaction(req) .run (()=> OrderItems.map (order =>
-      UPDATE (Books) .where ('ID =', order.book_ID)
-      .and ('stock >=', order.amount)
-      .set ('stock -=', order.amount)
+    const { Items: items } = req.data
+    return cds.transaction(req) .run (items.map (item =>
+      UPDATE (Books) .where ('ID =', item.book_ID)
+      .and ('stock >=', item.amount)
+      .set ('stock -=', item.amount)
     )) .then (all => all.forEach ((affectedRows,i) => {
       if (affectedRows === 0)  req.error (409,
-        `${OrderItems[i].amount} exceeds stock for book #${OrderItems[i].book_ID}`
+        `${items[i].amount} exceeds stock for book #${items[i].book_ID}`
       )
     }))
   })
diff --git a/package.json b/package.json
index f29d83fa..41936c96 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,8 @@
     "sqlite3": "^4"
   },
   "scripts": {
+    "bookshop": "cds watch bookshop",
+    "fiori": "cds watch fiori",
     "mocha": "npx mocha || echo",
     "jest": "npx jest --verbose",
     "test": "npm run jest -s"
diff --git a/reviewed/.env b/reviewed/.env
new file mode 100644
index 00000000..24a7ee31
--- /dev/null
+++ b/reviewed/.env
@@ -0,0 +1 @@
+cds.requires.messaging.kind = file-based-messaging
\ No newline at end of file
diff --git a/reviewed/package.json b/reviewed/package.json
index 1a11aed8..8bd2d2ff 100644
--- a/reviewed/package.json
+++ b/reviewed/package.json
@@ -14,9 +14,6 @@
       },
       "ReviewsService": {
         "kind": "odata", "model": "@capire/reviews"
-      },
-      "messaging": {
-        "kind": "file-based-messaging"
       }
     }
   }
diff --git a/reviewed/server.js b/reviewed/server.js
index a1661900..080b6be1 100644
--- a/reviewed/server.js
+++ b/reviewed/server.js
@@ -3,37 +3,30 @@
 //   This is an example of using a project-local server.js to intercept
 //   the default bootstrapping process.
 //
-
 const cds = require ('@sap/cds')
 
-// Mashup services after all are served...
-cds.once('served', async()=>{
+// Connect CatalogService and ReviewsService when all are served...
+cds.once('served', async ({CatalogService}) => {
 
-    // react on event messages from reviews service
+    // reflect entity definitions used below...
+    const { Books } = cds.entities('sap.capire.bookshop')
+    const { Reviews } = cds.entities('ReviewsService')
+
+    // prepend the following handler so it overrides the default handler
+    CatalogService.prepend (srv => srv.on ('READ', 'Books/reviews', (req) => {
+        console.debug ('> delegating request to ReviewsService')
+        const [id] = req.params, { columns, limit } = req.query.SELECT
+        return SELECT(columns).from(Reviews).limit(limit).where({subject:String(id)})
+    }))
+
+    // subscribe to events emitted by ReviewsService
     const ReviewsService = await cds.connect.to ('ReviewsService')
-    const db = await cds.connect.to ('db')
-
-    // reflect entities required below...
-    const { Books } = db.entities('sap.capire.bookshop')
-    const { Reviews } = ReviewsService.entities
-
     ReviewsService.on ('reviewed', (msg) => {
         console.debug ('> received:', msg.event, msg.data)
         const { subject, rating } = msg.data
-        const tx = db.tx (msg) // TODO: db.tx(msg) fully implemented?
-        return tx.update (Books,subject) .with ({rating})
+        return UPDATE(Books,subject).with({rating})
     })
 
-    // delegate requests to read reviews to ReviewsService
-    const CatalogService = await cds.connect.to ('CatalogService')
-    CatalogService.impl (srv => srv.on ('READ', 'Books/reviews', (req) => {
-        console.debug ('> delegating to ReviewsService')
-        const [ id ] = req.params
-        const tx = ReviewsService.tx(req)
-        return tx.read (Reviews) .where ({ subject: String(id) })
-        .columns (req.query.SELECT.columns)
-    }))
-
 })
 
 // Other bootstrapping events you could hook in to...
@@ -42,14 +35,9 @@ cds.on('bootstrap',(app) => {/* ... */})
 cds.on('loaded', (model) => {/* ... */})
 cds.on('connect', (srv) => {/* ... */})
 cds.on('serving', (srv) => {/* ... */})
+cds.once('served', (all) => {/* ... */})
 cds.once('listening', ({server,url}) => {/* ... */})
 
 
 // Delegate bootstrapping to built-in server.js
 module.exports = cds.server
-
-// Monkey-patching older releases
-if (cds.version < '3.33.4') cds.once('listening', ()=> cds.emit('served'))
-
-// Launch server if started directly from command-line
-if (!module.parent)  cds.server()
diff --git a/reviewed/test/requests.http b/reviewed/test/requests.http
index 8ee0a241..7a9d711c 100644
--- a/reviewed/test/requests.http
+++ b/reviewed/test/requests.http
@@ -31,7 +31,8 @@ GET {{bookshop}}/browse/Books(201)/reviews?
 
 ### Alternative OData URL
 GET {{bookshop}}/browse/Books/201/reviews?
-&$select=rating,date,reviewer,title
+&$select=rating,date,title
+&$top=3
 
 ###
 GET {{bookshop}}/browse/Books(201)?
diff --git a/reviews/.env b/reviews/.env
index 378d6075..2a372a9f 100644
--- a/reviews/.env
+++ b/reviews/.env
@@ -1 +1,3 @@
+cds.requires.messaging.kind = file-based-messaging
+cds.odata.skipValidation = true
 PORT = 5005
\ No newline at end of file
diff --git a/reviews/package.json b/reviews/package.json
index b974df69..373ba66c 100644
--- a/reviews/package.json
+++ b/reviews/package.json
@@ -18,9 +18,6 @@
     "requires": {
       "db": {
         "kind": "sql"
-      },
-      "messaging": {
-        "kind": "file-based-messaging"
       }
     }
   }
diff --git a/test/cds.ql.test.js b/test/cds.ql.test.js
index d69aea66..201fad70 100644
--- a/test/cds.ql.test.js
+++ b/test/cds.ql.test.js
@@ -464,47 +464,38 @@ describe('cds.ql → cqn', () => {
     UPDATE.with allows to pass in plain data payloads, e.g. as obtained from REST clients.
     In addition, UPDATE.with supports specifying expressions, either in CQL fragements
     notation or as simple expression objects.
-  */
-    test('with', () => {
-      expect(UPDATE(Foo).with(`foo=`, 11, `bar-=`, 22))
+
+    UPDATE.data allows to pass in plain data payloads, e.g. as obtained from REST clients.
+    The passed in object can be modified subsequently, e.g. by adding or modifying values
+    before the query is finally executed.
+    */
+    test('with + data', () => {
+      if (cds.version < '4.1.0') return
+      const o = {}
+      const q = UPDATE(Foo).data(o).with(`bar-=`, 22)
+      o.foo = 11
+      expect(q)
+        .to.eql(UPDATE(Foo).with(`foo=`, 11, `bar-=`, 22))
         .to.eql(UPDATE(Foo).with({ foo: 11, bar: { '-=': 22 } }))
         .to.eql({
           UPDATE: {
             entity: 'Foo',
+            data: { foo: 11 },
             with: {
-              foo: { val: 11 },
               bar: { xpr: [{ ref: ['bar'] }, '-', { val: 22 }] },
             },
           },
         })
 
       // some more
-      // expect(UPDATE(Foo).with(`bar = coalesce(x,y), car = 'foo''s bar, car'`)).to.eql({
-      //   UPDATE: {
-      //     entity: 'Foo',
-      //     with: {
-      //       bar: { func: 'coalesce', args: [{ ref: ['x'] }, { ref: ['y'] }] },
-      //       car: { val: "foo's bar, car" },
-      //     },
-      //   },
-      // })
-    })
-
-    /*
-    UPDATE.data allows to pass in plain data payloads, e.g. as obtained from REST clients.
-    The passed in object can be modified subsequently, e.g. by adding or modifying values
-    before the query is finally executed.
-  */
-    test('data', () => {
-      const o = {}
-      const q = UPDATE(Foo).data(o).with(`bar-=`, 22)
-      o.foo = 11
-      expect(q).to.eql({
+      expect(UPDATE(Foo).with(`bar = coalesce(x,y), car = 'foo''s bar, car'`)).to.eql({
         UPDATE: {
           entity: 'Foo',
-          data: { foo: 11 },
+          data: {
+            car: "foo's bar, car",
+          },
           with: {
-            bar: { xpr: [{ ref: ['bar'] }, '-', { val: 22 }] },
+            bar: { func: 'coalesce', args: [{ ref: ['x'] }, { ref: ['y'] }] },
           },
         },
       })
diff --git a/test/consuming-services.test.js b/test/consuming-services.test.js
index 6a5b4174..54a8410b 100644
--- a/test/consuming-services.test.js
+++ b/test/consuming-services.test.js
@@ -1,6 +1,10 @@
 const { expect } = require('./capire')
 const cds = require('@sap/cds')
 
+const cwd = process.cwd()
+before (()=> process.chdir(__dirname))
+after(()=> process.chdir(cwd))
+
 describe('Consuming Services locally', () => {
   //
   before('bootstrap db and services', async () => {
diff --git a/test/custom-handlers.test.js b/test/custom-handlers.test.js
index 5efec938..8c2f95d3 100644
--- a/test/custom-handlers.test.js
+++ b/test/custom-handlers.test.js
@@ -1,3 +1,12 @@
+const cwd = process.cwd()
+const is_jest = !!global.test
+if (is_jest) { // it's jest
+  global.before = (msg,fn) => global.beforeAll(fn||msg)
+  global.after = (msg,fn) => global.afterAll(fn||msg)
+}
+before (()=> process.chdir(__dirname))
+after (()=> process.chdir(cwd))
+
 describe('Custom Handlers', () => {
   const { GET, POST, expect } = require('./capire').launch('bookshop')
 
diff --git a/test/messaging.test.js b/test/messaging.test.js
index da3e9943..162db381 100644
--- a/test/messaging.test.js
+++ b/test/messaging.test.js
@@ -21,7 +21,7 @@ describe('Messaging', ()=>{
 
     let N=0, received=[], M=0
     it ('should add messaging event handlers', ()=>{
-        srv.on('reviewed', (msg)=> received.push(msg))
+        srv.on('reviewed', (msg)=> {received.push(msg)})
     })
 
     it ('should add more messaging event handlers', ()=>{