diff --git a/api/numberGame/Player.js b/api/numberGame/Player.js
index 05a14dc..d6cd8a5 100644
--- a/api/numberGame/Player.js
+++ b/api/numberGame/Player.js
@@ -7,6 +7,7 @@ class Player {
     this.totalScore = 0
     this.nextRound  = false
     this.avatar = avatar;
+    this.host = false
   } 
 
   guess(num) {
diff --git a/api/tests/numberGame/Player.test.js b/api/tests/numberGame/Player.test.js
index 81c7bb6..1d63bb5 100644
--- a/api/tests/numberGame/Player.test.js
+++ b/api/tests/numberGame/Player.test.js
@@ -20,14 +20,26 @@ describe('player', () => {
     const player = new Player('17326746', 'Bob') 
     expect(player.getTotalScore()).toBe(0)
   })
+  
   test('wonRound adds 1 to total score', () => {
     const player = new Player('17326746', 'Bob') 
     player.wonRound()
     expect(player.totalScore).toEqual(1)
   })
-  test('setIsHost makes player isHost true', () => {
+  
+  test('setIsHost', () => {
     const player = new Player('17326746', 'Bob') 
     player.setIsHost()
     expect(player.isHost).toEqual(true)
+
+  test('voteNextRound', () => {
+    const player = new Player('17326746', 'Bob')
+    player.voteNextRound()
+    expect(player.nextRound).toEqual(true)
+  })
+  test('setAvatar', () => {
+    const player = new Player('17326746', 'Bob')
+    player.setAvatar("avatar")
+    expect(player.avatar).toEqual("avatar")
   })
 })
\ No newline at end of file
diff --git a/api/tests/numberGame/game.test.js b/api/tests/numberGame/game.test.js
index 82d9c7a..d310488 100644
--- a/api/tests/numberGame/game.test.js
+++ b/api/tests/numberGame/game.test.js
@@ -192,4 +192,9 @@ describe("Game", () => {
             fetchMock.resetMocks();
         });
     });
+    describe("checkNextRound", () => {
+      test("given all players next round equals false", () => {
+        expect(game.checkNextRound()).toEqual(true)
+      })
+    })
 });
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index db3e7b7..7ed9ff0 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,6 +21,7 @@
         "@types/react-dom": "^18.3.0",
         "@vitejs/plugin-react": "^4.3.2",
         "@vitejs/plugin-react-swc": "^3.3.2",
+        "@vitest/coverage-v8": "^2.1.3",
         "@vitest/ui": "^2.1.3",
         "autoprefixer": "^10.4.20",
         "eslint": "^9.11.1",
@@ -468,6 +469,13 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@esbuild/aix-ppc64": {
       "version": "0.21.5",
       "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
@@ -1115,6 +1123,16 @@
         "node": ">=12"
       }
     },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
@@ -2129,6 +2147,39 @@
         "vite": "^4 || ^5"
       }
     },
+    "node_modules/@vitest/coverage-v8": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-2.1.3.tgz",
+      "integrity": "sha512-2OJ3c7UPoFSmBZwqD2VEkUw6A/tzPF0LmW0ZZhhB8PFxuc+9IBG/FaSM+RLEenc7ljzFvGN+G0nGQoZnh7sy2A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@ampproject/remapping": "^2.3.0",
+        "@bcoe/v8-coverage": "^0.2.3",
+        "debug": "^4.3.6",
+        "istanbul-lib-coverage": "^3.2.2",
+        "istanbul-lib-report": "^3.0.1",
+        "istanbul-lib-source-maps": "^5.0.6",
+        "istanbul-reports": "^3.1.7",
+        "magic-string": "^0.30.11",
+        "magicast": "^0.3.4",
+        "std-env": "^3.7.0",
+        "test-exclude": "^7.0.1",
+        "tinyrainbow": "^1.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "@vitest/browser": "2.1.3",
+        "vitest": "2.1.3"
+      },
+      "peerDependenciesMeta": {
+        "@vitest/browser": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@vitest/expect": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.3.tgz",
@@ -4372,6 +4423,13 @@
         "node": ">=12"
       }
     },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/http-proxy-agent": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
@@ -4891,6 +4949,60 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "license": "ISC"
     },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz",
+      "integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.23",
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/iterator.prototype": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.3.tgz",
@@ -5168,6 +5280,47 @@
         "@jridgewell/sourcemap-codec": "^1.5.0"
       }
     },
+    "node_modules/magicast": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.5.tgz",
+      "integrity": "sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.25.4",
+        "@babel/types": "^7.25.4",
+        "source-map-js": "^1.2.0"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -6830,6 +6983,47 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/test-exclude": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.1.tgz",
+      "integrity": "sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^10.4.1",
+        "minimatch": "^9.0.4"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/test-exclude/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/test-exclude/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 35a086d..f7fe9ed 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -26,6 +26,7 @@
     "@types/react-dom": "^18.3.0",
     "@vitejs/plugin-react": "^4.3.2",
     "@vitejs/plugin-react-swc": "^3.3.2",
+    "@vitest/coverage-v8": "^2.1.3",
     "@vitest/ui": "^2.1.3",
     "autoprefixer": "^10.4.20",
     "eslint": "^9.11.1",
diff --git a/frontend/src/components/AvatarSelector.jsx b/frontend/src/components/AvatarDropdown.jsx
similarity index 96%
rename from frontend/src/components/AvatarSelector.jsx
rename to frontend/src/components/AvatarDropdown.jsx
index c30eaeb..93ce869 100644
--- a/frontend/src/components/AvatarSelector.jsx
+++ b/frontend/src/components/AvatarDropdown.jsx
@@ -4,6 +4,7 @@ import { socket } from "../socket";
 const avatars = import.meta.glob("/src/assets/*.png", { eager: true });
 
 export function AvatarDropdown({ setAvatar, isOpen, setAvatarOpen}) {
+    //console.log("Avatar dropdown - avatars", avatars)
     const [avatarOptions, setAvatarOptions] = useState([]);
 
     useEffect(() => {
@@ -21,6 +22,7 @@ export function AvatarDropdown({ setAvatar, isOpen, setAvatarOpen}) {
         <>
         {isOpen && (
             <div
+    
             id="dropdownUsers"
             className="z-10 bg-white rounded-lg shadow w-60 dark:bg-gray-700"
             >
diff --git a/frontend/src/components/AvatarPlaceholder.jsx b/frontend/src/components/AvatarPlaceholder.jsx
deleted file mode 100644
index b7e0ed0..0000000
--- a/frontend/src/components/AvatarPlaceholder.jsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export function avatarPlaceholder() {
-    return (
-        <div className="relative w-10 h-10 overflow-hidden bg-gray-100 rounded-full dark:bg-gray-600">
-            <svg className="absolute w-12 h-12 text-gray-400 -left-1" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10 9a3 3 0 100-6 3 3 0 000 6zm-7 9a7 7 0 1114 0H3z" clip-rule="evenodd"></path></svg>
-        </div>
-    )
-}
\ No newline at end of file
diff --git a/frontend/src/components/Table.jsx b/frontend/src/components/Table.jsx
index dd911aa..4b0817f 100644
--- a/frontend/src/components/Table.jsx
+++ b/frontend/src/components/Table.jsx
@@ -1,31 +1,32 @@
 import { Gold, Silver, Bronze } from "../assets/Medals";
 
-export function Table({ players, sortBy }) {
-
+export function Table({ players, sortBy, showMedals }) {
   const position = (number) => {
     if (number === 0) {
       return <Gold />;
     } else if (number === 1) {
-      return <Silver />
+      return <Silver />;
     } else if (number === 2) {
-      return <Bronze />
+      return <Bronze />;
     }
-    return number + 1
+    return number + 1;
   };
 
   return (
     <div className="relative overflow-y-auto shadow-md sm:rounded-lg max-h-36 my-6">
-      <table className="w-full text-sm text-center rtl:text-right text-white dark:text-white">
-        <thead className="sticky top-0 text-md text-white uppercase bg-gray-50 dark:bg-gray-700 dark:text-white">
+      <table className="w-full text-sm text-center rtl:text-right text-gray-900 dark:text-white">
+        <thead className="sticky top-0 text-md text-gray-900 uppercase bg-yellow-300 dark:bg-gray-700 dark:text-white">
           <tr>
-            <th scope="col" className="px-3 py-2">
-              Pos.
-            </th>
+            {showMedals && (
+              <th scope="col" className="px-3 py-2">
+                Pos.
+              </th>
+            )}
             <th scope="col" className="px-3 py-2">
               Name
             </th>
             <th scope="col" className="px-3 py-2">
-            {sortBy === "totalScore" ? "Score" : "Guess"}
+              {sortBy === "totalScore" ? "Score" : "Guess"}
             </th>
           </tr>
         </thead>
@@ -35,7 +36,7 @@ export function Table({ players, sortBy }) {
               key={index}
               className="bg-white border-b dark:bg-gray-800 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-600"
             >
-              <td className="px-3 py-2">{position(index)}</td>
+              {showMedals && <td className="px-3 py-2">{position(index)}</td>}
               <td className="px-3 py-2">
                 <div className="flex justify-center items-center">
                   {" "}
@@ -49,8 +50,12 @@ export function Table({ players, sortBy }) {
                   {player.name}
                 </div>
               </td>
-              
-              <td className="px-3 py-2">{sortBy === "totalScore" ? player.totalScore : player.currentGuess}</td>
+
+              <td className="px-3 py-2">
+                {sortBy === "totalScore"
+                  ? player.totalScore
+                  : player.currentGuess}
+              </td>
             </tr>
           ))}
         </tbody>
diff --git a/frontend/src/components/TableCarousel.jsx b/frontend/src/components/TableCarousel.jsx
index 0c1ce81..3b1f2fd 100644
--- a/frontend/src/components/TableCarousel.jsx
+++ b/frontend/src/components/TableCarousel.jsx
@@ -28,7 +28,7 @@ const carouselTheme = {
     icon: "h-5 w-5 text-gray-600 sm:h-3 sm:w-3",
   },
   scrollContainer: {
-    base: "flex snap-mandatory overflow-y-hidden overflow-x-scroll scroll-smooth rounded-lg",
+    base: "flex snap-mandatory overflow-y-hidden overflow-x-hidden scroll-smooth rounded-lg",
     snap: "snap-x",
   },
 };
@@ -41,14 +41,14 @@ export function TableCarousel({ players, weight }) {
   const playersByGuess = players && [...players].sort((a, b) => Math.abs(weight - a.currentGuess) - Math.abs(weight - b.currentGuess))
   return (
     <Carousel theme={carouselTheme} leftControl=" " rightControl=" ">
-      <div className="w-full">
+      <div className="w-full pb-4">
         Last Game
-        {players && <Table players={playersByGuess} sortBy="currentGuess"/>}
+        {players && <Table players={playersByGuess} sortBy="currentGuess" showMedals={false}/>}
 
       </div>
       <div className="w-full overflow-auto">
         Leaderboard
-        {players && <Table players={playersByScore} sortBy="totalScore"/>}
+        {players && <Table players={playersByScore} sortBy="totalScore" showMedals={true}/>}
       </div>
     </Carousel>
   );
diff --git a/frontend/src/components/UsernameForm.jsx b/frontend/src/components/UsernameForm.jsx
index 8e82f30..25469e0 100644
--- a/frontend/src/components/UsernameForm.jsx
+++ b/frontend/src/components/UsernameForm.jsx
@@ -1,6 +1,6 @@
 // A form that allows a user to input tet and numbers
 import { useState } from "react";
-import { AvatarDropdown } from "./AvatarSelector";
+import { AvatarDropdown } from "./AvatarDropdown"
 
 export function UsernameForm({ input, setInput, avatar, setAvatar, error }) {
   const [avatarOpen, setAvatarOpen] = useState(false);
@@ -16,11 +16,13 @@ export function UsernameForm({ input, setInput, avatar, setAvatar, error }) {
         ></label>
         <div className="flex">
           <span
+            data-testid="select-avatar"
             className="relative inline-flex items-center px-3 text-sm text-gray-900 bg-gray-200 border border-e-0 border-gray-300 rounded-s-md dark:bg-gray-600 dark:text-gray-400 dark:border-gray-600 cursor-pointer"
             onClick={() => setAvatarOpen(!avatarOpen)} // Toggle avatar dropdown on click
           >
             {avatar ? (
               <img
+                data-testid="avatar-img"
                 className="w-8 h-8 rounded-full"
                 src={avatar}
                 alt="Selected Avatar"
@@ -73,7 +75,7 @@ export function UsernameForm({ input, setInput, avatar, setAvatar, error }) {
 
         </div>
         {avatarOpen && (
-          <div className="absolute z-10">
+          <div className="absolute z-10" data-testid="avatar-dropdown">
             <AvatarDropdown
               setAvatar={setAvatar}
               setAvatarOpen={setAvatarOpen}
diff --git a/frontend/tests/components/avatarDropdown.test.jsx b/frontend/tests/components/avatarDropdown.test.jsx
new file mode 100644
index 0000000..59e165a
--- /dev/null
+++ b/frontend/tests/components/avatarDropdown.test.jsx
@@ -0,0 +1,31 @@
+//imports needed 
+import { render, screen } from "@testing-library/react";
+import { describe, expect, test,vi } from "vitest";
+import userEvent from "@testing-library/user-event";
+import { AvatarDropdown } from "../../src/components/AvatarDropdown";
+import { socket } from "../../src/socket";
+
+
+vi.mock("../../src/socket.js", () => {
+  return { socket: { emit: vi.fn() } };
+});
+const setAvatar = vi.fn()
+const setAvatarOpen = vi.fn()
+ 
+describe("Avatar dropdown", () => {
+    test('user can select a specific avatar', async () => {
+      const user = userEvent.setup()
+    //user sees the avatar list
+    render(<AvatarDropdown setAvatar={setAvatar} isOpen={true} setAvatarOpen={setAvatarOpen}/>)
+    //user clicks on an avatar
+    const avatarEl = screen.getByAltText("Avatar 0")
+    await user.click(avatarEl)
+    //handle click is called
+    expect(setAvatar).toHaveBeenCalledWith("/src/assets/1.png")
+    expect(socket.emit).toHaveBeenCalledWith("avatar-selected","/src/assets/1.png")
+    expect(setAvatarOpen).toHaveBeenCalledWith(false)
+
+    })
+  })
+  
+
diff --git a/frontend/tests/components/listPlayers.test.jsx b/frontend/tests/components/listPlayers.test.jsx
index 497fcac..f1d46ae 100644
--- a/frontend/tests/components/listPlayers.test.jsx
+++ b/frontend/tests/components/listPlayers.test.jsx
@@ -35,4 +35,36 @@ describe("List players component", () => {
     const loadingSpinnerEls = screen.getAllByTestId("loading-spinner-svg");
     expect(loadingSpinnerEls.length).toEqual(1);
   });
-});
+  test("when a player has an avatar it is visible", () => {
+    const playersWithAvatar = [
+      {
+        currentGuess: 1,
+        id: "WHbOG6ET1uHeg-MqAAA8",
+        name: "Alexia (Host)",
+        totalScore: 0,
+        avatar: "/avatar.png"
+      },
+    ]
+    render(<ListPlayers players={playersWithAvatar} />);
+    const imgEl = screen.getByAltText("Alexia (Host)'s avatar")
+    expect(imgEl).toHaveProperty('src', 'http://localhost:3000/avatar.png')
+  })
+  
+  test("when a player who has not guessed has an avatar it is visible", () => {
+  // mock player who has not guessed
+  const playersWithAvatar = [
+    {
+      currentGuess: null,
+      id: "WHbOG6ET1uHeg-MqAAA8",
+      name: "Alexia (Host)",
+      totalScore: 0,
+      avatar: "/avatar.png"
+    },
+  ]
+  
+  render(<ListPlayers players={playersWithAvatar} />);
+    const imgEl = screen.getByAltText("Alexia (Host)'s avatar")
+    expect(imgEl).toHaveProperty('src', 'http://localhost:3000/avatar.png')
+  
+  });
+})
\ No newline at end of file
diff --git a/frontend/tests/components/placeholder.md b/frontend/tests/components/placeholder.md
deleted file mode 100644
index 182dcbb..0000000
--- a/frontend/tests/components/placeholder.md
+++ /dev/null
@@ -1 +0,0 @@
-Please delete this file
\ No newline at end of file
diff --git a/frontend/tests/components/usernameForm.test.jsx b/frontend/tests/components/usernameForm.test.jsx
new file mode 100644
index 0000000..c60ccb2
--- /dev/null
+++ b/frontend/tests/components/usernameForm.test.jsx
@@ -0,0 +1,33 @@
+//tests for the username form component visible on landing
+
+//imports needed 
+import { render, screen } from "@testing-library/react";
+import { describe, expect, test } from "vitest";
+import { UsernameForm } from "../../src/components/UsernameForm";
+import userEvent from "@testing-library/user-event";
+
+describe("Username Form", () => {
+
+//avatar selection tests
+  test("given an avatar link it is displayed", () => {
+    render(<UsernameForm avatar={"./testroute"}/>)
+    const imgEl = screen.getByTestId("avatar-img")
+    expect(imgEl).toHaveProperty('src', 'http://localhost:3000/testroute')
+  })
+
+//avatar dropdown
+  test("user clicks on icon and sees the dropdown", async () => {
+    // user sees the username form
+    const user = userEvent.setup()
+    render(<UsernameForm />)
+    //user clicks on the icon
+    const buttonEl = screen.getByTestId("select-avatar")
+    await user.click(buttonEl)
+    //expect dropdown to appear
+    const dropdownEl = screen.getByTestId("avatar-dropdown")
+    expect(dropdownEl).toBeDefined()
+  })
+
+})
+
+
diff --git a/frontend/tests/handlers/placeholder.md b/frontend/tests/handlers/placeholder.md
deleted file mode 100644
index 182dcbb..0000000
--- a/frontend/tests/handlers/placeholder.md
+++ /dev/null
@@ -1 +0,0 @@
-Please delete this file
\ No newline at end of file
diff --git a/frontend/tests/pages/RoundEnd.test.jsx b/frontend/tests/pages/RoundEnd.test.jsx
index c401052..25f02ff 100644
--- a/frontend/tests/pages/RoundEnd.test.jsx
+++ b/frontend/tests/pages/RoundEnd.test.jsx
@@ -85,6 +85,7 @@ describe("Round end tests", () => {
     const targetNumberEl = screen.getAllByText("Alexia(Host)");
     expect(targetNumberEl).toBeDefined();
   });
+  
   test("there is a next round button", () => {
     render(
       <RoundEnd gameState={gameState} pokemon={mockPokemon} redirect={""} setRedirect={setRedirect} />
@@ -95,6 +96,7 @@ describe("Round end tests", () => {
     });
     expect(nextRoundButtonEl).toBeDefined();
   });
+
   test("when the next round button is clicked it calls the socket", async () => {
     render(
       <RoundEnd gameState={gameState} pokemon={mockPokemon} redirect={""} setRedirect={setRedirect} />
@@ -106,6 +108,7 @@ describe("Round end tests", () => {
     await user.click(nextRoundButtonEl);
     expect(socket.emit).toHaveBeenCalledWith("next_round");
   });
+  
   test("there is a quit game button button", () => {
     render(
       <RoundEnd gameState={gameState} pokemon={mockPokemon} redirect={""} setRedirect={setRedirect} />
@@ -114,6 +117,7 @@ describe("Round end tests", () => {
     const quitGameButtonEl = screen.getByRole("button", { name: "Quit Game" });
     expect(quitGameButtonEl).toBeDefined();
   });
+  
   test("when the next quit button it calls socket and naviagte", async () => {
     render(
       <RoundEnd gameState={gameState} pokemon={mockPokemon} redirect={""} setRedirect={setRedirect} />
@@ -127,6 +131,7 @@ describe("Round end tests", () => {
     expect(socket.emit).toHaveBeenCalledWith("quit_game", gameState.id);
     expect(navigate).toHaveBeenCalledWith("/")
   });
+  
   test("when the redirct state changes the user is redirect", () => {
     render(
       <RoundEnd gameState={gameState} pokemon={mockPokemon} redirect={"/test-route"} setRedirect={setRedirect} />
@@ -135,4 +140,30 @@ describe("Round end tests", () => {
     expect(navigate).toHaveBeenCalledWith("/test-route")
     expect(setRedirect).toHaveBeenCalledWith("")
   })
-});
+
+  test("when there is there is no winner, display prompt", () => {
+    const gameWithNoWinners = {
+      players: [
+        {
+          currentGuess: null,
+          id: "WHbOG6ET1uHeg-MqAAA8",
+          name: "Alexia(Host)",
+          totalScore: 0,
+        },
+        {
+          currentGuess: null,
+          id: "werjighig52-54252tgv",
+          name: "Lucy",
+          totalScore: 2,
+        },
+      ],
+      targetNumber: 42,
+      currentRoundWinner: null
+    }
+    render(<RoundEnd gameState={gameWithNoWinners} pokemon={mockPokemon} redirect={""} setRedirect={setRedirect} />)
+
+    expect(screen.getByText("No one guessed in time!"))
+    expect(screen.getByText("Poor Sam..."))
+  });
+})
+  
diff --git a/frontend/tests/services/placeholder.md b/frontend/tests/services/placeholder.md
deleted file mode 100644
index 182dcbb..0000000
--- a/frontend/tests/services/placeholder.md
+++ /dev/null
@@ -1 +0,0 @@
-Please delete this file
\ No newline at end of file
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index 424bf98..10e8d12 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -27,7 +27,8 @@ export default defineConfig({
         "**/vitest.{workspace,projects}.[jt]s?(on)",
         "**/.{eslint,mocha,prettier}rc.{?(c|m)js,yml}",
         "**/*.config.*",
-        "**/socket.js"
+        "**/socket.js",
+        "**/main.jsx"
       ],
     },
   },