diff --git a/ts/test/components/AvatarPlaceHolder_test.tsx b/ts/test/components/AvatarPlaceHolder_test.tsx
index e4e39702f..ff36ef6ff 100644
--- a/ts/test/components/AvatarPlaceHolder_test.tsx
+++ b/ts/test/components/AvatarPlaceHolder_test.tsx
@@ -1,5 +1,4 @@
 /* eslint-disable import/no-extraneous-dependencies */
-import { cleanup } from '@testing-library/react';
 import { expect } from 'chai';
 import Sinon from 'sinon';
 import { AvatarSize } from '../../components/avatar/Avatar';
@@ -19,7 +18,6 @@ describe('AvatarPlaceHolder', () => {
 
   afterEach(() => {
     Sinon.restore();
-    cleanup();
   });
 
   it('should render an svg', async () => {
@@ -55,11 +53,12 @@ describe('AvatarPlaceHolder', () => {
 
     expect(areResultsEqual(result, result2, true)).to.equal(true);
     result.unmount();
+    result2.unmount();
   });
   it('should render the background using a color from our theme', async () => {
     const testPubkey = TestUtils.generateFakePubKeyStr();
     const result = renderComponent(
-      // NOTE we test the pubkey to color generation and ordering with appium. Since we can't access the value of a css variable in the test
+      // NOTE we need to test the pubkey to color generation and ordering with appium. Since we can't access the value of a css variable in with the current unit test setup
       <AvatarPlaceHolder
         diameter={AvatarSize.XL}
         name={displayName}
diff --git a/ts/test/components/SessionInput_test.tsx b/ts/test/components/SessionInput_test.tsx
index c857892f7..b4832bac0 100644
--- a/ts/test/components/SessionInput_test.tsx
+++ b/ts/test/components/SessionInput_test.tsx
@@ -1,5 +1,4 @@
 /* eslint-disable import/no-extraneous-dependencies */
-import { cleanup } from '@testing-library/react';
 import { expect } from 'chai';
 import Sinon from 'sinon';
 import { SessionInput } from '../../components/inputs';
@@ -15,7 +14,6 @@ describe('SessionInput', () => {
 
   afterEach(() => {
     Sinon.restore();
-    cleanup();
   });
 
   it('should render an input', async () => {
diff --git a/ts/test/session/unit/updater/updater_test.ts b/ts/test/session/unit/updater/updater_test.ts
index 232c2106b..887faec20 100644
--- a/ts/test/session/unit/updater/updater_test.ts
+++ b/ts/test/session/unit/updater/updater_test.ts
@@ -1,6 +1,7 @@
+import path from 'path';
+
 import { readFileSync } from 'fs-extra';
 import { isEmpty } from 'lodash';
-import path from 'path';
 
 describe('Updater', () => {
   it.skip('isUpdateAvailable', () => {});