diff --git a/data/api/LuminexGuideSet.html b/data/api/LuminexGuideSet.html
deleted file mode 100644
index 4276462038..0000000000
--- a/data/api/LuminexGuideSet.html
+++ /dev/null
@@ -1,235 +0,0 @@
-
-<input type="button" value="Load QWPs" onClick="loadQWP(0);" id="button_loadqwps"/>
-<input type="button" value="Test Insert,Update,Delete" onClick="getValidDataAndRunId();" id="button_testiud"/>
-<input type="button" value="Attempt update CurveFit"  onClick="updateCurveFit('CurveFit', 'RowId');" id="button_updateCurveFit"/>
-<input type="button" value="Attempt update GuideSetCurveFit"  onClick="updateCurveFit('GuideSetCurveFit', 'GuideSetId');" id="button_updateGuideSetCurveFit"/>
-<div id="qwp-div">Query Web Part DIV</div>
-<div id="log-info">Logging Info DIV</div>
-
-<script type="text/javascript">
-        var tablePrefix = "&TestAssayLuminex></% 1";
-        var loadedQWPsOnce = false;
-        var currentStep = 0;
-        var logHtml = "";
-        var validDataId = null;
-        var validRunId = null;
-
-        var qwpArray = [
-            {table: "Analyte", cols: ["RowId", "Name"], sort: "RowId"},
-            {table: "AnalyteTitration", cols: ["Analyte", "Titration"], sort: "Analyte, Titration"},
-            {table: "CurveFit", cols: ["RowId", "EC50", "AUC"], sort: "RowId"},
-            {table: "GuideSet", cols: ["RowId", "AnalyteName", "Conjugate", "Isotype", "Comment"], sort: "RowId"},
-            {table: "GuideSetCurveFit", cols: ["GuideSetId", "AUCAverage", "EC50Average"], sort: "GuideSetId"},
-            {table: "QCFlags", cols: ["RowId", "FlagType", "Description", "Enabled"], sort: "RowId"},
-            {table: "Titration", cols: ["RowId", "Name"], sort: "RowId"},
-            {table: "RunExclusion", cols: ["RunId", "Comment"], sort: "RunId"},
-            {table: "WellExclusion", cols: ["RowId", "Description", "Comment"], sort: "RowId"}
-        ];
-
-        function loadQWP(index)
-        {
-            var record = qwpArray[index];
-            var sql = 'SELECT ';
-            for (var i = 0; i < record.cols.length; i++)
-            {
-                sql += (i > 0 ? ',' : '') + ' x.' + record.cols[i];
-            }
-            sql += ' FROM "' + tablePrefix + ' ' + record.table + '"' + ' AS x';
-
-            new LABKEY.QueryWebPart({
-               title: tablePrefix + ' ' + record.table,
-               schemaName: 'assay',
-               sql: sql,
-               sort: record.sort,
-               renderTo: 'qwp-div',
-               success: function(dataRegion) {
-                   updateLog("Success: loaded " + record.table + " QWP with " + dataRegion.rowCount + ".", true);
-                   if (record.expectedRows != undefined && record.expectedRows != dataRegion.rowCount)
-                   {
-                       updateLog("<span class='labkey-error'>" + "Unexpected " + "Error: unexpcted number of records in " + record.table + " QWP (expected " + record.expectedRows + ")</span>", true);
-                   }
-
-                   // store the rowCount for checking if the loadQWP is called again
-                   qwpArray[index].expectedRows = dataRegion.rowCount;
-
-                   if (qwpArray.length > index+1)
-                   {
-                       loadQWP(index+1);
-                   }
-                   else
-                   {
-                       updateLog("Done" + " loading QWPs" + (loadedQWPsOnce ? " again" : ""), true);
-                       updateLog("", true); // add a blank line
-                       Ext.get('qwp-div').update(""); // clear the QWP div
-                       loadedQWPsOnce = true;
-                   }
-               }
-            });
-        }
-
-        var insertArray = [
-            {table: "Analyte", insertRow: {}, insertFailureExpected: true},
-            {table: "AnalyteTitration", insertRow: {}, insertFailureExpected: true},
-            {table: "CurveFit", insertRow: {}, insertFailureExpected: true},
-            {table: "GuideSet", keyVar: "rowId", updateVar: "comment", insertRow: {analyteName: "Test Analyte", titrationName: "Test Titration", currentGuideSet: false}, insertFailureExpected: false, updateFailureExpected: false, deleteFailureExpected: true},
-            {table: "GuideSetCurveFit", insertRow: {}, insertFailureExpected: true},
-            {table: "QCFlags", keyVar: "rowId", updateVar: "comment", insertRow: {runId: 1, flagType: "TEST", description: "Test Description", enabled: true}, insertFailureExpected: false, updateFailureExpected: false, deleteFailureExpected: false},
-            {table: "Titration", insertRow: {}, insertFailureExpected: true},
-            {table: "RunExclusion", keyVar: "runId", updateVar: "comment", insertRow: {runId: 1}, insertFailureExpected: false, updateFailureExpected: false, deleteFailureExpected: false},
-            {table: "WellExclusion", keyVar: "rowId", updateVar: "comment", insertRow: {dataId: 1, type: "T1", description: "TEST"}, insertFailureExpected: false, updateFailureExpected: false, deleteFailureExpected: false}
-        ];
-
-        function getValidDataAndRunId()
-        {
-            // before we can call the insert, update, and delete testing function, we will need a valid dataId and runId
-            // we can use the ones that are used by the existing WellExclusion
-            LABKEY.Query.selectRows({
-                schemaName: "assay",
-                queryName: tablePrefix + " WellExclusion",
-                columns: "DataId, DataId/Run/RowId",
-                success: function(data){
-                    if (data.rows.length > 0)
-                    {
-                        validDataId = data.rows[0]["DataId"];
-                        validRunId = data.rows[0]["DataId/Run/RowId"];
-                    }
-
-                    testInsertUpdateDelete(0);
-                }
-            });
-        }
-
-        function testInsertUpdateDelete(index)
-        {
-            var record = insertArray[index];
-
-            // replace the temp runId and dataId values with valid ones
-            if (record.insertRow.runId)
-                record.insertRow.runId = parseInt(validRunId) - 1;
-            if (record.insertRow.dataId)
-                record.insertRow.dataId = validDataId;            
-
-            LABKEY.Query.insertRows({
-                schemaName: 'assay',
-                queryName: tablePrefix + ' ' + record.table,
-                rows: [record.insertRow],
-                success: insertSuccess(record, index),
-                failure: insertFailure("insert", record, index, record.insertFailureExpected)
-            });
-        }
-
-        function insertSuccess(record, index)
-        {
-            return function(data) {
-                updateLog("Success: inserted record into " + record.table, true);
-                if (data.rowsAffected != 1)
-                    updateLog("<span class='labkey-error'>" + "Unexpected " + "Error: unexpected number of rows affected by insert into " + record.table + "(" + data.rowsAffected + " rows affected)</span>", true);
-
-                var keyVal = (data.rows[0][record.keyVar] ? data.rows[0][record.keyVar] : data.rows[0][record.keyVar.toLowerCase()]);
-                var updateRow = record.insertRow;
-                updateRow[record.keyVar] = keyVal;
-                updateRow[record.updateVar] = "updated via javascript";
-
-                LABKEY.Query.updateRows({
-                    schemaName: 'assay',
-                    queryName: tablePrefix + ' ' + record.table,
-                    rows: [updateRow],
-                    success: updateSuccess(record, index),
-                    failure: insertFailure("update", record, index, record.updateFailureExpected)
-                });
-            }
-        }
-
-        function updateSuccess(record, index)
-        {
-            return function(data) {
-                updateLog("Success: updated record in " + record.table, true);
-                if (data.rowsAffected != 1)
-                    updateLog("<span class='labkey-error'>" + "Unexpected " + "Error: unexpected number of rows affected by update in " + record.table + "(" + data.rowsAffected + " rows affected)</span>", true);
-
-                var deleteRow = {};
-                deleteRow[record.keyVar] = (data.rows[0][record.keyVar] ? data.rows[0][record.keyVar] : data.rows[0][record.keyVar.toLowerCase()]);
-
-                if (record.deleteFailureExpected)
-                {
-                    if (qwpArray[index].expectedRows != undefined)
-                        qwpArray[index].expectedRows++;
-                    
-                    checkForNextInsert(index);
-                }
-                else
-                {
-                    LABKEY.Query.deleteRows({
-                        schemaName: 'assay',
-                        queryName: tablePrefix + ' ' + record.table,
-                        rows: [deleteRow],
-                        success: function(){
-                            updateLog("Success: deleted record from " + record.table, true);
-                            checkForNextInsert(index);
-                        },
-                        failure: insertFailure("delete", record, index, record.deleteFailureExpected)
-                    });
-                }
-            }
-        }
-
-        function insertFailure(type, record, index, failureExpected)
-        {
-            return function(response){
-                if (failureExpected)
-                    updateLog("Expected " + type + " failure for " + record.table + ": " + response.exception, true);
-                else
-                    updateLog("<span class='labkey-error'>" + "Unexpected " + "Error: " + type + " failed for " + record.table + ": " + response.exception + "</span>", true);
-
-                checkForNextInsert(index);
-            }
-        }
-
-        function checkForNextInsert(index)
-        {
-            if (insertArray.length > index+1)
-            {
-               testInsertUpdateDelete(index+1);
-            }
-            else
-            {
-               updateLog("Done " + "testing inserts, updates, and deletes", true);
-               updateLog("", true); // add a blank line
-            }
-        }
-
-
-        function updateCurveFit(table, keyVar)
-        {
-            LABKEY.Query.selectRows({
-                schemaName: 'assay',
-                queryName: tablePrefix + ' ' + table,
-                success: function(data) {
-                    var updateRow = {};
-                    updateRow[keyVar] = data.rows[0][keyVar];
-
-                    // expect the update for teh CurveFit table to fail
-                    LABKEY.Query.updateRows({
-                        schemaName: 'assay',
-                        queryName: tablePrefix + ' ' + table,
-                        rows: [updateRow],
-                        success: function(){
-                            updateLog("Unexpected " + "Error: unexpected successful update of " + table, true);
-                            updateLog("Done with " + table + " update", true);
-                            updateLog("", true);
-                        },
-                        failure: function(response){
-                            updateLog("Expected update failure for " + table + ": " + response.exception, true);
-                            updateLog("Done with " + table + " update", true);
-                            updateLog("", true);                            
-                        }
-                     });
-                }
-             });
-        }
-
-        function updateLog(newHtml, newLine){
-            logHtml += (newLine ? "<br/>" : "") + newHtml;
-            Ext.get('log-info').update(logHtml);
-        }
-</script>
\ No newline at end of file
diff --git a/data/api/getDataAggregateTest.html b/data/api/getDataAggregateTest.html
index 14be593050..cc4e550207 100644
--- a/data/api/getDataAggregateTest.html
+++ b/data/api/getDataAggregateTest.html
@@ -1,6 +1,7 @@
 <div id="getData-config-form-div"></div>
 <br/>
 <div id="getData-grid-div"></div>
+<!-- Used as HTML wiki source, so nonce is NOT required -->
 <script type="text/javascript">
 
 function init() {
diff --git a/data/api/getDataDateTest.html b/data/api/getDataDateTest.html
index 037130c4d4..bde7434e4e 100644
--- a/data/api/getDataDateTest.html
+++ b/data/api/getDataDateTest.html
@@ -1,6 +1,7 @@
 <div id="getData-config-form-div"></div>
 <br/>
 <div id="getData-grid-div"></div>
+<!-- Used as HTML wiki source, so nonce is NOT required -->
 <script type="text/javascript">
     function getDateOptions(query, dateName)
     {
diff --git a/data/api/getDataErrorsTest.html b/data/api/getDataErrorsTest.html
index d1790a6d5b..94d180007a 100644
--- a/data/api/getDataErrorsTest.html
+++ b/data/api/getDataErrorsTest.html
@@ -1,6 +1,7 @@
 <div id="getData-config-form-div"></div>
 <br/>
 <div id="getData-message-div"></div>
+<!-- Used as HTML wiki source, so nonce is NOT required -->
 <script type="text/javascript">
 
 LABKEY.requiresExt3(function() {
diff --git a/data/api/getDataTest.html b/data/api/getDataTest.html
index d6d5d0d9ca..f9589719bf 100644
--- a/data/api/getDataTest.html
+++ b/data/api/getDataTest.html
@@ -3,6 +3,7 @@
  *
  * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
  */
+<!-- Used as HTML wiki source, so nonce is NOT required -->
 <script type="text/javascript">
 
 var id = 'jsonWrapperTest';
diff --git a/data/api/getDataVisitTest.html b/data/api/getDataVisitTest.html
index 72ab94413a..11454c69e8 100644
--- a/data/api/getDataVisitTest.html
+++ b/data/api/getDataVisitTest.html
@@ -1,6 +1,7 @@
 <div id="getData-config-form-div"></div>
 <br/>
 <div id="getData-grid-div"></div>
+<!-- Used as HTML wiki source, so nonce is NOT required -->
 <script type="text/javascript">
     var cd4Measure = {
         "measure":{
diff --git a/data/api/groupSecurityTest.html b/data/api/groupSecurityTest.html
index 8ed5ab577f..5c0a307935 100644
--- a/data/api/groupSecurityTest.html
+++ b/data/api/groupSecurityTest.html
@@ -1,5 +1,6 @@
 <button class="labkey-button" id="start-test">Start Test</button>
 <div id="log-info"></div>
+<!-- Used as HTML wiki source, so nonce is NOT required -->
 <script type="text/javascript">
 
     var logHtml = "";
diff --git a/data/api/jsReportTest.html b/data/api/jsReportTest.html
index b594b17066..df2b2b1869 100644
--- a/data/api/jsReportTest.html
+++ b/data/api/jsReportTest.html
@@ -1,5 +1,6 @@
 <div id="rreporttest"></div>
 <div id="jsreporttest"></div>
+<!-- Used as HTML wiki source, so nonce is NOT required -->
 <script type="text/javascript">
 
     (function(){
diff --git a/data/api/nabApiTest.html b/data/api/nabApiTest.html
index ddac82ea0c..4458c9f64a 100644
--- a/data/api/nabApiTest.html
+++ b/data/api/nabApiTest.html
@@ -1,4 +1,5 @@
 <div id="testDiv"></div>
+<!-- Used as HTML wiki source, so nonce is NOT required -->
 <script type="text/javascript">
 (function() {
     var testProjectName = 'Nab Test Verify Project';
diff --git a/modules/crawlerTest/src/org/labkey/crawlertest/CrawlerTestController.java b/modules/crawlerTest/src/org/labkey/crawlertest/CrawlerTestController.java
index 15d661af38..78d1a9b8a4 100644
--- a/modules/crawlerTest/src/org/labkey/crawlertest/CrawlerTestController.java
+++ b/modules/crawlerTest/src/org/labkey/crawlertest/CrawlerTestController.java
@@ -70,7 +70,7 @@ public void addNavTrail(NavTree root)
     }
 
     @RequiresPermission(ReadPermission.class)
-    public class ExternalLinkAction extends SimpleViewAction<Object>
+    public static class ExternalLinkAction extends SimpleViewAction<Object>
     {
         @Override
         public ModelAndView getView(Object form, BindException errors)
diff --git a/modules/restrictedModule/resources/views/webpart.html b/modules/restrictedModule/resources/views/webpart.html
index 095594bc51..ecfa547f59 100644
--- a/modules/restrictedModule/resources/views/webpart.html
+++ b/modules/restrictedModule/resources/views/webpart.html
@@ -1,7 +1,7 @@
 <p>This is a web part view in the restricted module.</p>
-<a id="testlink" href="<%=contextPath%>/project<%=containerPath%>/begin.view">begin</a>
+<a id="testlink" href="<%=contextPath%><%=containerPath%>/project-begin.view">begin</a>
 <script type="text/javascript" nonce="<%=scriptNonce%>">
-    Ext.onReady(function()
+    LABKEY.Utils.onReady(function()
     {
         var webpart=<%=webpartContext%>;
     });
diff --git a/src/org/labkey/test/LabKeySiteWrapper.java b/src/org/labkey/test/LabKeySiteWrapper.java
index e6c6298f6a..3775d23ddb 100644
--- a/src/org/labkey/test/LabKeySiteWrapper.java
+++ b/src/org/labkey/test/LabKeySiteWrapper.java
@@ -465,7 +465,6 @@ protected void changeUserEmail(String userEmail, String newUserEmail)
         clickButton("Submit");
     }
 
-
     protected void setSystemMaintenance(boolean enable)
     {
         // Not available in production mode
diff --git a/src/org/labkey/test/tests/AbstractKnitrReportTest.java b/src/org/labkey/test/tests/AbstractKnitrReportTest.java
index c3f398ba93..8d10a345cf 100644
--- a/src/org/labkey/test/tests/AbstractKnitrReportTest.java
+++ b/src/org/labkey/test/tests/AbstractKnitrReportTest.java
@@ -34,12 +34,9 @@
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 
 /**
- * User: tgaluhn
- * Date: 9/20/2017
- *
  * Split helper methods and tests from KnitrReportTest so a subset of those test cases can be run in RSandboxTest
  */
 public abstract class AbstractKnitrReportTest extends BaseWebDriverTest
@@ -57,7 +54,7 @@ private static String readReport(final Path reportFile)
 
         reportSource = TestFileUtils.getFileContents(reportFile);
 
-        assertTrue("No data in report file [" + reportFile.getFileName() + "]", reportSource.length() > 0);
+        assertFalse("No data in report file [" + reportFile.getFileName() + "]", reportSource.isEmpty());
 
         return reportSource;
     }
diff --git a/src/org/labkey/test/tests/KnitrReportTest.java b/src/org/labkey/test/tests/KnitrReportTest.java
index 6b401225f6..3b3ba0feb6 100644
--- a/src/org/labkey/test/tests/KnitrReportTest.java
+++ b/src/org/labkey/test/tests/KnitrReportTest.java
@@ -72,7 +72,7 @@ public void testKnitrHTMLFormat()
     }
 
     @Test
-    public void testKnitrMarkupFormat() throws Exception
+    public void testKnitrMarkupFormat()
     {
         Locator.XPathLocator plotLocator = Locator.xpath("//div[@class='labkey-knitr']//img");
         Locator[] reportContains = {Locator.tag("h1").withText("A Minimal Example for Markdown"),
@@ -128,7 +128,7 @@ public void testAdhocReportDependenciesLib()
     }
 
     @Test
-    public void testRmarkdownV2Support() throws Exception
+    public void testRmarkdownV2Support()
     {
         markdownV2();
     }
diff --git a/src/org/labkey/test/tests/TimeChartAPITest.java b/src/org/labkey/test/tests/TimeChartAPITest.java
index 8c0b78537f..1ae883c580 100644
--- a/src/org/labkey/test/tests/TimeChartAPITest.java
+++ b/src/org/labkey/test/tests/TimeChartAPITest.java
@@ -264,8 +264,8 @@ protected void doCreateSteps()
     }
 
     @SafeVarargs
-    private final void testVisApi(File htmlPage, String[] testTitles, @Nullable int[] testRowCounts, @Nullable String[][] testColumnNames,
-                                  @Nullable String[] testOutputTexts, List<Pair<String, List<Object>>>... colsForAllTests)
+    private void testVisApi(File htmlPage, String[] testTitles, @Nullable int[] testRowCounts, @Nullable String[][] testColumnNames,
+                            @Nullable String[] testOutputTexts, List<Pair<String, List<Object>>>... colsForAllTests)
     {
         PortalHelper portalHelper = new PortalHelper(this);
         WikiHelper wikiHelper = new WikiHelper(this);
diff --git a/src/org/labkey/test/tests/viability/AbstractViabilityTest.java b/src/org/labkey/test/tests/viability/AbstractViabilityTest.java
index 2f757f245d..e124cfe845 100644
--- a/src/org/labkey/test/tests/viability/AbstractViabilityTest.java
+++ b/src/org/labkey/test/tests/viability/AbstractViabilityTest.java
@@ -77,7 +77,6 @@ protected void initializeStudyFolder(String... tabs)
         clickButton("Create Study");
     }
 
-
     protected void importSpecimens()
     {
         importSpecimens(getFolderName(), TestFileUtils.getSampleData("viability/specimens.txt"));
diff --git a/src/org/labkey/test/tests/viability/ViabilityTest.java b/src/org/labkey/test/tests/viability/ViabilityTest.java
index db4914fc9a..778a029dc2 100644
--- a/src/org/labkey/test/tests/viability/ViabilityTest.java
+++ b/src/org/labkey/test/tests/viability/ViabilityTest.java
@@ -224,7 +224,7 @@ protected void runReRunTest()
     protected void runResultSpecimenLookupTest()
     {
         log("** Checking ResultSpecimens lookups");
-        beginAt("/query/" + getProjectName() + "/" + getFolderName() + "/executeQuery.view?schemaName=assay&query.queryName=" + getAssayName() + " ResultSpecimens");
+        beginAt("/" + getProjectName() + "/" + getFolderName() + "/query-executeQuery.view?schemaName=assay&query.queryName=" + getAssayName() + " ResultSpecimens");
         DataRegionTable table = new DataRegionTable("query", this);
         assertTextPresent(new TextSearcher(table.getComponentElement()::getText), "foobar", "vial1", "xyzzy", "160450533-5", "161400006.11-5");