diff --git a/baselayer b/baselayer
index 43d904f..6c97b39 160000
--- a/baselayer
+++ b/baselayer
@@ -1 +1 @@
-Subproject commit 43d904f632313f369a2ecfa5552d7c520dad620f
+Subproject commit 6c97b3978b81bfdb0f14459b3190a695bf1ab1a6
diff --git a/cesium_app/tests/frontend/test_features.py b/cesium_app/tests/frontend/test_features.py
index 48f16ac..7e65073 100644
--- a/cesium_app/tests/frontend/test_features.py
+++ b/cesium_app/tests/frontend/test_features.py
@@ -98,7 +98,7 @@ def test_check_uncheck_tags(driver, project, dataset):
         driver.find_element_by_css_selector('[name=amplitude]').click()
 
     driver.find_element_by_css_selector('[label=General]').click()
-    driver.wait_for_xpath('//*[@name="amplitude"]', 2)
+    driver.wait_for_xpath('//*[@name="amplitude"]')
 
 
 def test_feature_descriptions_displayed(driver, project, dataset):
@@ -164,7 +164,7 @@ def test_plot_features(driver, project, dataset, featureset):
     driver.wait_for_xpath("//td[contains(text(),'{}')]".format(featureset.name)).click()
     driver.wait_for_xpath("//b[contains(text(),'Please wait while we load your plotting data...')]")
 
-    driver.wait_for_xpath("//*[@class='bk-plotdiv']", 3)
+    driver.wait_for_xpath("//*[@class='bk-plotdiv']")
 
 
 def test_delete_featureset(driver, project, dataset, featureset):