diff --git a/public/app/features/explore/RichHistory/RichHistory.test.tsx b/public/app/features/explore/RichHistory/RichHistory.test.tsx
index 0948d178e9d..1b978d1b7a2 100644
--- a/public/app/features/explore/RichHistory/RichHistory.test.tsx
+++ b/public/app/features/explore/RichHistory/RichHistory.test.tsx
@@ -24,9 +24,6 @@ const setup = (propOverrides?: Partial<RichHistoryProps>) => {
 };
 
 describe('RichHistory', () => {
-  it('should render component without errors', () => {
-    setup();
-  });
   it('should correctly render all tabs in tab bar', () => {
     const wrapper = setup();
     expect(wrapper.html()).toContain('Query history');
diff --git a/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx b/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx
index 4e7f6b3b5ee..5423427cbbf 100644
--- a/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx
@@ -40,9 +40,6 @@ const starredQueryWithComment = {
 };
 
 describe('RichHistoryCard', () => {
-  it('should render without errors', () => {
-    setup();
-  });
   it('should render all queries', () => {
     const wrapper = setup();
     expect(wrapper.html()).toContain('query1');
diff --git a/public/app/features/explore/RichHistory/RichHistoryCard.tsx b/public/app/features/explore/RichHistory/RichHistoryCard.tsx
index e2012ad80ea..d12e0ef9199 100644
--- a/public/app/features/explore/RichHistory/RichHistoryCard.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryCard.tsx
@@ -117,7 +117,7 @@ export function RichHistoryCard(props: Props) {
       <div className={styles.queryCardLeft} onClick={() => onChangeQuery(query)}>
         {query.queries.map((q, i) => {
           return (
-            <div title="query" key={`${q}-${i}`} className={styles.queryRow}>
+            <div key={`${q}-${i}`} className={styles.queryRow}>
               {q}
             </div>
           );
diff --git a/public/app/features/explore/RichHistory/RichHistoryContainer.test.tsx b/public/app/features/explore/RichHistory/RichHistoryContainer.test.tsx
index 6dc3f559085..6fc18762269 100644
--- a/public/app/features/explore/RichHistory/RichHistoryContainer.test.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryContainer.test.tsx
@@ -25,9 +25,6 @@ const setup = (propOverrides?: Partial<Props>) => {
 };
 
 describe('RichHistoryContainer', () => {
-  it('should render without errors', () => {
-    setup();
-  });
   it('should render reseizable component', () => {
     const wrapper = setup();
     expect(wrapper.find(Resizable)).toHaveLength(1);
diff --git a/public/app/features/explore/RichHistory/RichHistoryQueriesTab.test.tsx b/public/app/features/explore/RichHistory/RichHistoryQueriesTab.test.tsx
index 8b912d2913a..03795fdd367 100644
--- a/public/app/features/explore/RichHistory/RichHistoryQueriesTab.test.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryQueriesTab.test.tsx
@@ -25,14 +25,10 @@ const setup = (propOverrides?: Partial<Props>) => {
 };
 
 describe('RichHistoryQueriesTab', () => {
-  it('should render without errors', () => {
-    setup();
-  });
-
   describe('slider', () => {
     it('should render slider', () => {
       const wrapper = setup();
-      expect(wrapper.html()).toContain('aria-label="slider');
+      expect(wrapper.html()).toContain('aria-label="Slider');
     });
     it('should render slider with correct timerange', () => {
       const wrapper = setup();
@@ -44,14 +40,14 @@ describe('RichHistoryQueriesTab', () => {
   describe('sort options', () => {
     it('should render sorter', () => {
       const wrapper = setup();
-      expect(wrapper.html()).toContain('aria-label="sort queries"');
+      expect(wrapper.html()).toContain('aria-label="Sort queries"');
     });
   });
 
   describe('select datasource', () => {
     it('should render select datasource if activeDatasourceOnly is false', () => {
       const wrapper = setup();
-      expect(wrapper.html()).toContain('aria-label="filter datasources"');
+      expect(wrapper.html()).toContain('aria-label="Filter datasources"');
     });
 
     it('should not render select datasource if activeDatasourceOnly is true', () => {
diff --git a/public/app/features/explore/RichHistory/RichHistoryQueriesTab.tsx b/public/app/features/explore/RichHistory/RichHistoryQueriesTab.tsx
index 440bbdde278..c4c7e5eb19e 100644
--- a/public/app/features/explore/RichHistory/RichHistoryQueriesTab.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryQueriesTab.tsx
@@ -162,7 +162,7 @@ export function RichHistoryQueriesTab(props: Props) {
   return (
     <div className={styles.container}>
       <div className={styles.containerSlider}>
-        <div className={styles.slider} aria-label="slider">
+        <div className={styles.slider} aria-label="Slider">
           <div className="label-slider">
             Filter history <br />
             between
@@ -187,7 +187,7 @@ export function RichHistoryQueriesTab(props: Props) {
       <div className={styles.containerContent}>
         <div className={styles.selectors}>
           {!activeDatasourceOnly && (
-            <div className={styles.multiselect} aria-label="filter datasources">
+            <div className={styles.multiselect} aria-label="Filter datasources">
               <Select
                 isMulti={true}
                 options={datasources}
@@ -197,7 +197,7 @@ export function RichHistoryQueriesTab(props: Props) {
               />
             </div>
           )}
-          <div className={styles.sort} aria-label="sort queries">
+          <div className={styles.sort} aria-label="Sort queries">
             <Select
               options={sortOrderOptions}
               placeholder="Sort queries by"
diff --git a/public/app/features/explore/RichHistory/RichHistoryStarredTab.test.tsx b/public/app/features/explore/RichHistory/RichHistoryStarredTab.test.tsx
index 4c5d7de1da4..7fe299dbb8e 100644
--- a/public/app/features/explore/RichHistory/RichHistoryStarredTab.test.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryStarredTab.test.tsx
@@ -24,25 +24,22 @@ const setup = (propOverrides?: Partial<Props>) => {
 };
 
 describe('RichHistoryStarredTab', () => {
-  it('should render without errors', () => {
-    setup();
-  });
   describe('sorter', () => {
     it('should render sorter', () => {
       const wrapper = setup();
-      expect(wrapper.html()).toContain('aria-label="sort queries"');
+      expect(wrapper.html()).toContain('aria-label="Sort queries"');
     });
   });
 
   describe('select datasource', () => {
     it('should render select datasource if activeDatasourceOnly is false', () => {
       const wrapper = setup();
-      expect(wrapper.html()).toContain('aria-label="filter datasources"');
+      expect(wrapper.html()).toContain('aria-label="Filter datasources"');
     });
 
     it('should not render select datasource if activeDatasourceOnly is true', () => {
       const wrapper = setup({ activeDatasourceOnly: true });
-      expect(wrapper.html()).not.toContain('aria-label="filter datasources"');
+      expect(wrapper.html()).not.toContain('aria-label="Filter datasources"');
     });
   });
 });
diff --git a/public/app/features/explore/RichHistory/RichHistoryStarredTab.tsx b/public/app/features/explore/RichHistory/RichHistoryStarredTab.tsx
index 3812960753c..f2c594534e6 100644
--- a/public/app/features/explore/RichHistory/RichHistoryStarredTab.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryStarredTab.tsx
@@ -111,7 +111,7 @@ export function RichHistoryStarredTab(props: Props) {
       <div className={styles.containerContent}>
         <div className={styles.selectors}>
           {!activeDatasourceOnly && (
-            <div className={styles.multiselect} aria-label="filter datasources">
+            <div className={styles.multiselect} aria-label="Filter datasources">
               <Select
                 isMulti={true}
                 options={exploreDatasources}
@@ -121,7 +121,7 @@ export function RichHistoryStarredTab(props: Props) {
               />
             </div>
           )}
-          <div className={styles.sort} aria-label="sort queries">
+          <div className={styles.sort} aria-label="Sort queries">
             <Select
               options={sortOrderOptions}
               placeholder="Sort queries by"