diff --git a/notes/srv/RemoteHandler.js b/notes/srv/RemoteHandler.js
index 190b524f..258a2e04 100644
--- a/notes/srv/RemoteHandler.js
+++ b/notes/srv/RemoteHandler.js
@@ -168,7 +168,6 @@ class RemoteHandler {
 
     // REVISIT: How to call service datasource w/o handlers
     // REVISIT: const result = await targetService.read(target).columns(req.query.SELECT.columns).where({ [targetKeyFieldName]: entry[keyFieldName] });
-    // TODO: Seems not to respect filter for targetkeyFieldName
     const selectTarget = SELECT(req.query.SELECT.columns)
       .from(target)
       .where({ [targetKeyFieldName]: entry[keyFieldName] });
diff --git a/test/notes.test.js b/test/notes.test.js
index 8fa932a8..e522fd73 100644
--- a/test/notes.test.js
+++ b/test/notes.test.js
@@ -109,6 +109,16 @@ const NotesExpandSuppliers = [
         }
     ];
 
+const BPMock = {
+  url: /.*/,
+  data: BPs
+};
+
+const BP11Mock = {
+  url: /\/A_BusinessPartner\?.*\$filter=BusinessPartner%20eq%20%2711%27/,
+  data: [ BPs[0] ]
+};
+
 class MockServer {
   async start() {
     const http = require('http');
@@ -116,13 +126,29 @@ class MockServer {
     this.app = express();
     this.server = http.createServer(this.app).listen();
     this.app.set('port', this.server.address().port);
+    this.mocks = [];
 
     this.app.get("*", (req, res) => {
+      const mock = this.mocks.shift();
+      if (!mock || !req.url.match(mock.url)) {
+        res.writeHead(404);
+        res.end();
+        return;
+      }
+
       res.writeHead(200);
-      res.end(JSON.stringify(BPs));
+      res.end(JSON.stringify(mock.data));
     });
   }
 
+  reset() {
+    this.mocks = [];
+  }
+
+  add(mock) {
+    this.mocks.push(mock);
+  }
+
   url() {
     return `http://localhost:${this.server.address().port}`;
   }
@@ -155,6 +181,10 @@ describe("Notes", () => {
 
   });
 
+  beforeEach( () => {
+    mockServer.reset();
+  });
+
   const { expect, GET, PATCH } = require(".").run(
     "serve",
     "--project",
@@ -193,6 +223,7 @@ describe("Notes", () => {
   });
 
   it("get remote suppliers", async () => {
+    mockServer.add(BPMock);
     const { status, data } = await GET("/notes/Suppliers");
 
     expect({ status, data }).to.containSubset({
@@ -202,6 +233,7 @@ describe("Notes", () => {
   });
 
   it("get remote suppliers with notes", async () => {
+    mockServer.add(BPMock);
     const { status, data } = await GET("/notes/Suppliers?$expand=notes");
 
     expect({ status, data }).to.containSubset({
@@ -211,6 +243,7 @@ describe("Notes", () => {
   });
 
   it("get notes via navigation", async () => {
+    mockServer.add(BPMock);
     const { status, data } = await GET("/notes/Suppliers('11')/notes");
 
     expect({ status, data }).to.containSubset({
@@ -220,6 +253,7 @@ describe("Notes", () => {
   });
 
   it("get notes with suppliers", async () => {
+    mockServer.add(BPMock);
     const { status, data } = await GET("/notes/Notes?$expand=supplier");
 
     expect({ status, data }).to.containSubset({
@@ -228,18 +262,14 @@ describe("Notes", () => {
     });
   });
 
-      // TODO: Seems not to respect filter for targetKeyFieldName
-      /*
-
-  it.only("get supplier via navigation", async () => {
-    const { status, data } = await GET("/notes/Notes(545A3CF9-84CF-46C8-93DC-E29F0F2BC6BE)/supplier");
+  it("get supplier via navigation", async () => {
+    mockServer.add(BP11Mock);
+    const { status, data } = await GET(`/notes/Notes(${ NotesExpandSuppliers[1].ID })/supplier`);
     expect({ status, data }).to.containSubset({
       status: 200,
-      data: envelope("Suppliers", NotesExpandSuppliers[0].supplier )
+      data: envelope("../$metadata#Suppliers/$entity", NotesExpandSuppliers[1].supplier )
     });
   });
-  */
 
-
-  after(() => mockServer.close());
+  afterAll(() => mockServer.close());
 });