diff --git a/src/routes/test/system-test.js b/src/routes/test/system-test.js
index da76e3a92..ac95c4bff 100644
--- a/src/routes/test/system-test.js
+++ b/src/routes/test/system-test.js
@@ -157,10 +157,10 @@ describe('System', function () {
             expect(response.statusCode).to.equal(200);
             expect(response.body.usage.ts).to.be.a('number');
 
-            const filesystems = Object.keys(response.body.usage.disks);
+            const filesystems = Object.keys(response.body.usage.filesystems);
             let dockerUsage = null;
             for (const fs of filesystems) {
-                for (const content of response.body.usage.disks[fs].contents) {
+                for (const content of response.body.usage.filesystems[fs].contents) {
                     if (content.id === 'docker') dockerUsage = content;
                 }
             }
diff --git a/src/test/groups-test.js b/src/test/groups-test.js
index ecbddfa9a..6ce3ed52f 100644
--- a/src/test/groups-test.js
+++ b/src/test/groups-test.js
@@ -116,7 +116,7 @@ describe('Groups', function () {
         it('can getWithMembers', async function () {
             const result = await groups.getWithMembers(group0Object.id);
             expect(result.name).to.be(group0Name);
-            expect(result.userIds).to.eql([ admin.id, user.id ]);
+            expect(result.userIds.sort()).to.eql([ admin.id, user.id ].sort());
         });
 
         it('can set group membership', async function () {
diff --git a/src/test/reverseproxy-test.js b/src/test/reverseproxy-test.js
index a422a7b55..e3d256450 100644
--- a/src/test/reverseproxy-test.js
+++ b/src/test/reverseproxy-test.js
@@ -22,8 +22,8 @@ describe('Reverse Proxy', function () {
     after(cleanup);
 
     describe('validateCertificate', function () {
-        let foobarDomain = 'foobar.com';
-        let amazingDomain = 'amazing.com';
+        const foobarDomain = 'foobar.com';
+        const amazingDomain = 'amazing.com';
         /*
           Generate these with:
             openssl genrsa -out server.key 512
@@ -40,8 +40,8 @@ describe('Reverse Proxy', function () {
         const validKey1 = '-----BEGIN RSA PRIVATE KEY-----\nMIIBOQIBAAJBAKMUYf86EG+J6ughAvhKGbIIyOpB3XqnK6KVM+r2/DvFx2KGIew7\nKopkzM2+UThDWE2YTcgL5846QRbx+K5NAXECAwEAAQJAL/m/GqaqTyXzxXZwuTqT\ndJzA/qmBzqN/YsUiEO24Jp0AVuERlgiKBbxpu0xp8EpDsLTEt6TWWy1p0HIH6e0j\nAQIhANIZkHD6gVxvAMz0tquSprBnylqHngdT/PymDEHHNPv1AiEAxrUTvxV+vmii\n5CCLFTnYTQliKr+PC5qxn2WxV1rPng0CIGTiS55EW0t0LbE8rF40XAAGxn6z8ijY\npnj2jpojOojlAiBoaA6XEXFGFO651QufPISVfb+x3HMJ0t9PdHxo/NMoJQIgbVUh\naQKzUcrgIM2nbg4fLp3+VAh0ZkxNwaeKcsZz0cQ=\n-----END RSA PRIVATE KEY-----\n';
 
         // baz.foobar.com
-        const validCert2 = '-----BEGIN CERTIFICATE-----\nMIIBzTCCAXcCFG3UtlC/mgM6sp2591h+oywv83xhMA0GCSqGSIb3DQEBCwUAMGgx\nCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEQ\nMA4GA1UECgwHTmVidWxvbjEMMAoGA1UECwwDQ1RPMRcwFQYDVQQDDA5iYXouZm9v\nYmFyLmNvbTAeFw0yMDExMjIwMTU0MjFaFw0yNDExMjEwMTU0MjFaMGgxCzAJBgNV\nBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEQMA4GA1UE\nCgwHTmVidWxvbjEMMAoGA1UECwwDQ1RPMRcwFQYDVQQDDA5iYXouZm9vYmFyLmNv\nbTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQD74G9b+gOxoznt3hDgZCORTOMHT+CU\nouPg/RjwidKEsc6531THPt0hyoeb3H0w62pNGG2Ic2gUtkuxTdre6mvZAgMBAAEw\nDQYJKoZIhvcNAQELBQADQQCarEdycosj9EMNB7HYrqMsSpwdhpORbFozsGYRbTaA\ntDE8tCCOleSsVMDtW2jwL5e+we1QQO+dM88K0pqTKHEm\n-----END CERTIFICATE-----\n';
-        const validKey2 = '-----BEGIN RSA PRIVATE KEY-----\nMIIBPAIBAAJBAPvgb1v6A7GjOe3eEOBkI5FM4wdP4JSi4+D9GPCJ0oSxzrnfVMc+\n3SHKh5vcfTDrak0YbYhzaBS2S7FN2t7qa9kCAwEAAQJBALsBjWyKmcd/2vjCkWEo\nuEefAEhjg+iXb/2RrLyad1TQfgs35UfigcjpWbzT2ScpFZT61ng6hKmclt2OCT9F\nBKECIQD/bjRbGiPq762ikWkfvalgkAAhSoXo2AcD/MsrhWyyPQIhAPxwM7jZRNvO\nng3TJaAgISwwUC9vuaNJQ06Yt02pvoXNAiEAuQipTrGCAWe8vb5ei8rFzxihr3wf\nw0vy0RWoTA+sbPUCIHDFOwXf4bgEJG1unwdacxdHefrHAXold3D8Hh8OrnMdAiEA\nov6sW0C1+maNpoWC+moDGFdImZnej2SDIB5976akWVo=\n-----END RSA PRIVATE KEY-----\n';
+        const validCert2 = '-----BEGIN CERTIFICATE-----\nMIIBzTCCAXcCFDnT77DcYIJ5EtAjyN7125yvCVtKMA0GCSqGSIb3DQEBCwUAMGgx\nCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEQ\nMA4GA1UECgwHTmVidWxvbjEMMAoGA1UECwwDQ1RPMRcwFQYDVQQDDA5iYXouZm9v\nYmFyLmNvbTAeFw0yNDEyMDQxNTMwMzRaFw0zNDEyMDIxNTMwMzRaMGgxCzAJBgNV\nBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEQMA4GA1UE\nCgwHTmVidWxvbjEMMAoGA1UECwwDQ1RPMRcwFQYDVQQDDA5iYXouZm9vYmFyLmNv\nbTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC3PwF9imDPxtYTEbg+Grz5GSgc6Rqk\nNsMOyeOLDmEF+KiXf1iHZ+6dlXNeE8ULCnTomQ8KQ3VGKT596fqDF+pzAgMBAAEw\nDQYJKoZIhvcNAQELBQADQQCuzLEHQIG5kiWL7gkLMHURCkNqLrxEQmhm3RVNkeGZ\n6GXhS3qKc4PEl6kxK6XZXI/OPimmMGF+CKpJNpx88xMm\n-----END CERTIFICATE-----\n';
+        const validKey2 = '-----BEGIN PRIVATE KEY-----\nMIIBVwIBADANBgkqhkiG9w0BAQEFAASCAUEwggE9AgEAAkEAtz8BfYpgz8bWExG4\nPhq8+RkoHOkapDbDDsnjiw5hBfiol39Yh2funZVzXhPFCwp06JkPCkN1Rik+fen6\ngxfqcwIDAQABAkEAgEXGkU6wfkG90RNyWWb2KZkGj1ZNo+4BlPSWJ90k5bv/ZGhN\n02H7ur2Lz8WOzrw/pQsK4g3xD5t+2I6RvzTywQIhANvdaeK13jI2822HHgMdY9Cp\nm3e69OxdPa2/t0+ExH7ZAiEA1VzlKtgI1j6gYQ70sa1N/dAsiFk8K2X7WuHKxeFh\n/CsCIQC7XQdD/OpabnupxfBshRovkqn7MWZRGvBZ5bvoVuNAmQIhAJoXW/6kRUWN\nt0BBj+EeO5xaEz9pyvXA0lZhiZN94ck/AiEAiLXiDwsUjOzcgGeX1wtn3fPlHZ1r\nbI3V4DXKe3AjUms=\n-----END PRIVATE KEY-----\n';
 
         /*
             Generate these with: