--- a/mock-api/endpoints/jvm-gc.endpoint.js	Fri Aug 25 10:00:51 2017 -0400
+++ b/mock-api/endpoints/jvm-gc.endpoint.js	Fri Aug 25 12:29:31 2017 -0400
@@ -2,18 +2,13 @@
   var _ = require('lodash');
   server.init('jvmGc');
   var accumulatedMicros = 1000;
-  server.app.get('/jvm-gc/0.0.3/jvms', function (req, res, next) {
+  server.app.get('/jvm-gc/0.0.3/jvms/:jvmId', function (req, res, next) {
     server.logRequest('jvm-gc', req);
 
+    var jvmId = req.params.jvmId;
+
     var query = req.query.query;
     query = _.split(query, '&');
-    var jvmId = 'foo-jvmId';
-    for (var i = 0; i < query.length; i++) {
-      var str = query[i];
-      if (_.startsWith(str, 'jvmId')) {
-        jvmId = _.split(str, '==')[1];
-      }
-    }
     var limit = req.query.limit || 1;
 
     var response = [];

--- a/mock-api/endpoints/jvm-memory.endpoint.js	Fri Aug 25 10:00:51 2017 -0400
+++ b/mock-api/endpoints/jvm-memory.endpoint.js	Fri Aug 25 12:29:31 2017 -0400
@@ -1,18 +1,10 @@
 function jvmMemory (server) {
   var _ = require('lodash');
   server.init('jvmMemory');
-  server.app.get('/jvm-memory/0.0.3', function (req, res, next) {
+  server.app.get('/jvm-memory/0.0.3/jvms/:jvmId', function (req, res, next) {
     server.logRequest('jvm-memory', req);
 
-    var query = req.query.query;
-    query = _.split(query, '&');
-    var jvmId = undefined;
-    for (var i = 0; i < query.length; i++) {
-      var str = query[i];
-      if (_.startsWith(str, 'jvmId')) {
-        jvmId = _.split(str, '==')[1];
-      }
-    }
+    var jvmId = req.params.jvmId;
 
     res.setHeader('Content-Type', 'application/json');
     res.send(JSON.stringify(