diff --git a/app/internal_packages/activity/specs/activity-list-spec.jsx b/app/internal_packages/activity/specs/activity-list-spec.jsx
index e2e66e64b..112087fb6 100644
--- a/app/internal_packages/activity/specs/activity-list-spec.jsx
+++ b/app/internal_packages/activity/specs/activity-list-spec.jsx
@@ -8,12 +8,10 @@ import {
   DatabaseStore,
   FocusedPerspectiveStore,
 } from 'mailspring-exports';
-import ActivityList from '../lib/activity-list';
+import ActivityList from '../lib/list/activity-list';
 import ActivityEventStore from '../lib/activity-event-store';
 import TestDataSource from '../lib/test-data-source';
-
-const OPEN_TRACKING_ID = 'open-tracking-id';
-const LINK_TRACKING_ID = 'link-tracking-id';
+import { OPEN_TRACKING_ID, LINK_TRACKING_ID } from '../lib/plugin-helpers';
 
 const messages = [
   new Message({
diff --git a/app/spec/fixtures/packages/theme-with-ui-variables/styles/ui-variables.less b/app/spec/fixtures/packages/theme-with-ui-variables/styles/ui-variables.less
index b7343c436..41b3439d2 100755
--- a/app/spec/fixtures/packages/theme-with-ui-variables/styles/ui-variables.less
+++ b/app/spec/fixtures/packages/theme-with-ui-variables/styles/ui-variables.less
@@ -1,9 +1,13 @@
 // Variables different from the original are marked 'Changed'
+@import 'base/ui-variables';
 
 @text-color: #333;
 @text-color-subtle: #777;
 @text-color-highlight: #111;
 @text-color-selected: @text-color-highlight;
+@text-color-link: black;
+@text-color-link-hover: black;
+@text-color-search-match: black;
 
 @text-color-info: #5293d8;
 @text-color-success: #1fe977;
@@ -14,7 +18,7 @@
 @background-color-success: #17ca65;
 @background-color-warning: #ff4800;
 @background-color-error: #c00;
-@background-color-highlight: rgba(255, 255, 255, 0.10);
+@background-color-highlight: rgba(255, 255, 255, 0.1);
 @background-color-selected: @background-color-highlight;
 
 @background-primary: #00f; // Changed