diff --git a/webapp/components/_new/features/SearchResults/SearchResults.spec.js b/webapp/components/_new/features/SearchResults/SearchResults.spec.js
index 7a8e8bfd6..a78d5151c 100644
--- a/webapp/components/_new/features/SearchResults/SearchResults.spec.js
+++ b/webapp/components/_new/features/SearchResults/SearchResults.spec.js
@@ -34,9 +34,14 @@ describe('SearchResults', () => {
     propsData = {
       pageSize: 12,
     }
+    // Wolle jest.useFakeTimers()
     wrapper = Wrapper()
   })
 
+  afterEach(() => {
+    // Wolle jest.clearAllMocks()
+  })
+
   describe('mount', () => {
     it('renders tab-navigation component', () => {
       expect(wrapper.find('.tab-navigation').exists()).toBe(true)
@@ -49,8 +54,10 @@ describe('SearchResults', () => {
         })
       })
 
+      // Wolle beforeEach(jest.useFakeTimers)
+    
       describe('result contains 25 posts, 8 users and 0 hashtags', () => {
-        beforeEach(() => {
+        beforeEach(async () => {
           wrapper.setData({
             posts: helpers.fakePost(12),
             postCount: 25,
@@ -58,6 +65,7 @@ describe('SearchResults', () => {
             userCount: 8,
             activeTab: 'Post',
           })
+          // Wolle await wrapper.vm.$nextTick()
         })
 
         it('shows a total of 33 results', () => {
@@ -65,11 +73,16 @@ describe('SearchResults', () => {
         })
 
         it('shows tab with 25 posts found', () => {
-          expect(wrapper.find('.Post-tab').text()).toContain('25')
+          const postTab = wrapper.find('[data-test="Post-tab"]')
+          // console.log('postTab: ', postTab.html())
+          // console.log('wrapper: ', wrapper)
+          // Wolle jest.runAllTimers()
+          expect(postTab.text()).toContain('25')
         })
 
         it('shows tab with 8 users found', () => {
-          expect(wrapper.find('.User-tab').text()).toContain('8')
+          const userTab = wrapper.find('[data-test="User-tab"]')
+          expect(userTab.text()).toContain('8')
         })
 
         it('shows tab with 0 hashtags found', () => {
@@ -130,8 +143,9 @@ describe('SearchResults', () => {
           expect(wrapper.find('.next-button').exists()).toBe(true)
         })
 
-        it('displays no previous page button for the 25 posts', () => {
-          expect(wrapper.find('.previous-button').exists()).toBe(false)
+        it('deactivates previous page button for the 25 posts', () => {
+          const previousButton = wrapper.find('[data-test="previous-button"]')
+          expect(previousButton.attributes().disabled).toEqual('disabled')
         })
 
         it('displays page 2 / 3 when next-button is clicked', async () => {
@@ -180,11 +194,12 @@ describe('SearchResults', () => {
           ).toMatchObject({ query: undefined, firstPosts: 12, postsOffset: 24 })
         })
 
-        it('displays no next page button when next-button is clicked twice', async () => {
-          wrapper.find('.next-button').trigger('click')
-          wrapper.find('.next-button').trigger('click')
+        it('deactivates next page button when next-button is clicked twice', async () => {
+          const nextButton = wrapper.find('[data-test="next-button"]')
+          nextButton.trigger('click')
+          nextButton.trigger('click')
           await wrapper.vm.$nextTick()
-          await expect(wrapper.find('.next-button').exists()).toBe(false)
+          expect(nextButton.attributes().disabled).toEqual('disabled')
         })
 
         it('displays the previous page button when next-button is clicked twice', async () => {
diff --git a/webapp/components/_new/generic/TabNavigation/TabNavigation.vue b/webapp/components/_new/generic/TabNavigation/TabNavigation.vue
index f9018960a..64d43c932 100644
--- a/webapp/components/_new/generic/TabNavigation/TabNavigation.vue
+++ b/webapp/components/_new/generic/TabNavigation/TabNavigation.vue
@@ -1,5 +1,6 @@
 <template>
   <ul class="tab-navigation">
+    <!-- Wolle Fix warning for 'switchTab', see below. -->
     <li
       v-for="tab in tabs"
       :key="tab.type"
@@ -9,16 +10,23 @@
         'tab',
         tab.type + '-tab',
       ]"
-      role="button"
-      @click="$emit('switchTab', tab.type)"
       :style="tabWidth"
+      role="button"
+      :data-test="tab.type + '-tab'"
+      @click="$emit('switchTab', tab.type)"
     >
+      <!-- Wolle <ds-space :class="lowerCase('Post-tab')" margin="small"> -->
       <ds-space margin="small">
-        <client-only placeholder="Loading...">
+        <!-- <ds-number :label="tab.title"> -->
+          <!-- Wolle <hc-count-to slot="count" :end-val="tab.count" /> -->
+          {{ tab.count }}
+        <!-- </ds-number> -->
+        <!-- <client-only placeholder="Loading...">
           <ds-number :label="tab.title">
-            <hc-count-to slot="count" :end-val="tab.count" />
+            Wolle <hc-count-to slot="count" :end-val="tab.count" />
+            {{ tab.count }}
           </ds-number>
-        </client-only>
+        </client-only> -->
       </ds-space>
     </li>
   </ul>