diff --git a/src/lib/PlayerMedia.svelte b/src/lib/PlayerMedia.svelte
index d450a7c..8f5499b 100644
--- a/src/lib/PlayerMedia.svelte
+++ b/src/lib/PlayerMedia.svelte
@@ -1,16 +1,19 @@
 <script lang="ts">
-	import type { SeekToType, PlayerDispatcher, PlayerMediaRef } from './types';
+	import type { SeekToType } from './types';
 	import type {
 		OnProgressProps,
-		InternalPlayerKey,
 		OnErrorProps,
-		FilePlayerUrl,
-		Player
+		PlayerUrl,
+		Player,
+		PlayerRef,
+		PlayerDispatcher,
+		PlayerConfigObject,
+		PlayerGetPlayerKey
 	} from './players/types';
 	import { onMount, createEventDispatcher } from 'svelte';
 	import { isMediaStream } from './players/utils';
 
-	export let url: FilePlayerUrl;
+	export let url: PlayerUrl;
 	export let playing: boolean;
 	export let loop: boolean;
 	export let controls: boolean;
@@ -23,7 +26,7 @@
 	export let playsinline: boolean;
 	export let pip: boolean;
 	export let stopOnUnmount: boolean;
-	export let config: any; // Expect this type is `PlayerConfig` but, can't figure it out how
+	export let config: PlayerConfigObject;
 
 	export let progressFrequency: number | undefined = undefined;
 	export let disableDeferredLoading: boolean | undefined = undefined;
@@ -32,11 +35,14 @@
 	export let display: string | undefined = undefined;
 	export let activePlayer: Player['loadComponent'];
 
+	const SEEK_ON_PLAY_EXPIRY = 5000;
+	const dispatch = createEventDispatcher<PlayerDispatcher>();
+
 	let mounted = false;
 	let isReady = false;
 	let isPlaying = false; // Track playing state internally to prevent bugs
 	let isLoading = true; // Use isLoading to prevent onPause when switching URL
-	let loadOnReady: FilePlayerUrl | null = null;
+	let loadOnReady: PlayerUrl | null = null;
 	let seekOnPlay: number | null = null;
 	let progressTimeout: number | undefined = undefined;
 	let durationCheckTimeout: number | undefined = undefined;
@@ -44,10 +50,7 @@
 	let prevLoaded: number | undefined = undefined;
 	let onDurationCalled: boolean | undefined = undefined;
 	let startOnPlay: boolean | undefined = undefined;
-	let player: PlayerMediaRef | undefined;
-
-	const SEEK_ON_PLAY_EXPIRY = 5000;
-	const dispatch = createEventDispatcher<PlayerDispatcher>();
+	let player: PlayerRef;
 
 	onMount(function () {
 		mounted = true;
@@ -55,7 +58,7 @@
 		return function () {
 			clearTimeout(progressTimeout);
 			clearTimeout(durationCheckTimeout);
-			if (player !== undefined && isReady && stopOnUnmount) {
+			if (isReady && stopOnUnmount) {
 				player.stop();
 
 				if (player.disablePIP) {
@@ -68,52 +71,66 @@
 	});
 
 	function handlePropsUrlChange(propsUrl: typeof url) {
-		if (player !== undefined && isReady) {
-			if (isLoading && !forceLoad && !disableDeferredLoading && !isMediaStream(propsUrl)) {
-				console.warn(
-					`SveltePlayer: the attempt to load ${propsUrl} is being deferred until the player has loaded`
-				);
-				loadOnReady = propsUrl;
-				return;
-			}
-			isLoading = true;
-			startOnPlay = true;
-			onDurationCalled = false;
-			player.load(propsUrl, isReady);
+		// If there isn’t a player available, don’t do anything
+		if (!player) {
+			return;
+		}
+
+		if (isLoading && !forceLoad && !disableDeferredLoading && !isMediaStream(propsUrl)) {
+			console.warn(
+				`SveltePlayer: the attempt to load ${propsUrl} is being deferred until the player has loaded`
+			);
+			loadOnReady = propsUrl;
+			return;
 		}
+		isLoading = true;
+		startOnPlay = true;
+		onDurationCalled = false;
+		player.load(propsUrl, isReady);
 	}
 
 	$: handlePropsUrlChange(url);
 
 	function handlePropsPlayingChange(propsPlaying: typeof playing) {
-		if (player !== undefined && isReady) {
-			if (propsPlaying && !isPlaying) {
-				player.play();
-			}
-			if (!propsPlaying && isPlaying) {
-				player.pause();
-			}
+		// If there isn’t a player available, don’t do anything
+		if (!player) {
+			return;
+		}
+
+		if (propsPlaying && !isPlaying) {
+			player.play();
+		}
+		if (!propsPlaying && isPlaying) {
+			player.pause();
 		}
 	}
 
 	$: handlePropsPlayingChange(playing);
 
 	function handlePropsPipChange(propsPip: typeof pip) {
-		if (player !== undefined && isReady) {
-			if (propsPip && player.enablePIP) {
-				player.enablePIP();
-			}
+		// If there isn’t a player available, don’t do anything
+		if (!player) {
+			return;
+		}
 
-			if (!propsPip && player.disablePIP) {
-				player.disablePIP();
-			}
+		if (propsPip && player.enablePIP) {
+			player.enablePIP();
+		}
+
+		if (!propsPip && player.disablePIP) {
+			player.disablePIP();
 		}
 	}
 
 	$: handlePropsPipChange(pip);
 
 	function handlePropsVolumeChange(propsVolume: typeof volume) {
-		if (player !== undefined && isReady && propsVolume !== null) {
+		// If there isn’t a player available, don’t do anything
+		if (!player) {
+			return;
+		}
+
+		if (propsVolume !== null) {
 			player.setVolume(propsVolume);
 		}
 	}
@@ -121,19 +138,20 @@
 	$: handlePropsVolumeChange(volume);
 
 	function handlePropsMutedChange(propsMuted: typeof muted) {
-		if (player !== undefined && isReady) {
-			if (propsMuted) {
-				player.mute();
-			} else {
-				player.unmute();
-				if (volume !== null) {
-					// Set volume next tick to fix a bug with DailyMotion
-					setTimeout(function () {
-						if (player !== undefined && volume !== null) {
-							player.setVolume(volume);
-						}
-					});
-				}
+		// If there isn’t a player available, don’t do anything
+		if (!player) {
+			return;
+		}
+
+		if (propsMuted) {
+			player.mute();
+		} else {
+			player.unmute();
+			if (volume !== null) {
+				// Set volume next tick to fix a bug with DailyMotion
+				setTimeout(function () {
+					player.setVolume(Number(volume));
+				});
 			}
 		}
 	}
@@ -141,7 +159,12 @@
 	$: handlePropsMutedChange(muted);
 
 	function handlePropsPlaybackRateChange(propsPlaybackRate: typeof playbackRate) {
-		if (player !== undefined && isReady && player.setPlaybackRate) {
+		// If there isn’t a player available, don’t do anything
+		if (!player) {
+			return;
+		}
+
+		if (player.setPlaybackRate) {
 			player.setPlaybackRate(propsPlaybackRate);
 		}
 	}
@@ -149,7 +172,12 @@
 	$: handlePropsPlaybackRateChange(playbackRate);
 
 	function handlePropsLoopChange(propsLoop: typeof loop) {
-		if (player !== undefined && isReady && player.setLoop) {
+		// If there isn’t a player available, don’t do anything
+		if (!player) {
+			return;
+		}
+
+		if (player.setLoop) {
 			player.setLoop(propsLoop);
 		}
 	}
@@ -157,46 +185,36 @@
 	$: handlePropsLoopChange(loop);
 
 	function handlePlayerMount() {
-		if (player !== undefined) {
-			player.load(url);
-			progress();
-		}
+		player.load(url);
+		progress();
 	}
 
 	export function getDuration() {
-		if (player === undefined || !isReady) {
+		if (!isReady) {
 			return null;
 		}
 		return player.getDuration();
 	}
 
 	export function getCurrentTime() {
-		if (player === undefined || !isReady) {
+		if (!isReady) {
 			return null;
 		}
 		return player.getCurrentTime();
 	}
 
 	export function getSecondsLoaded() {
-		if (player === undefined || !isReady) {
+		if (!isReady) {
 			return null;
 		}
 		return player.getSecondsLoaded();
 	}
 
-	export function getInternalPlayer(key: InternalPlayerKey) {
-		if (!player) return null;
-		switch (key) {
-			case 'player':
-				if (player.getPlayer !== undefined) {
-					return player.getPlayer();
-				}
-				return null;
-			case 'hls':
-			case 'dash':
-			default:
-				return null;
+	export function getInternalPlayer(key?: PlayerGetPlayerKey) {
+		if (!player) {
+			return null;
 		}
+		return player.getPlayer(key);
 	}
 
 	function progress() {
@@ -226,7 +244,7 @@
 
 	export function seekTo(amount: number, type?: SeekToType, keepPlaying = false) {
 		// When seeking before player is ready, store value and seek later
-		if (player === undefined || !isReady) {
+		if (!isReady) {
 			if (amount !== 0) {
 				seekOnPlay = amount;
 				setTimeout(function () {
@@ -258,13 +276,13 @@
 		isLoading = false;
 		dispatch('ready');
 
-		if (player !== undefined && !muted && volume !== null) {
+		if (!muted && volume !== null) {
 			player.setVolume(volume);
 		}
-		if (player !== undefined && loadOnReady) {
+		if (loadOnReady) {
 			player.load(loadOnReady, true);
 			loadOnReady = null;
-		} else if (player !== undefined && playing) {
+		} else if (playing) {
 			player.play();
 		}
 		handleDurationCheck();
@@ -274,7 +292,7 @@
 		isPlaying = true;
 		isLoading = false;
 		if (startOnPlay) {
-			if (player !== undefined && player.setPlaybackRate && playbackRate !== 1) {
+			if (player.setPlaybackRate && playbackRate !== 1) {
 				player.setPlaybackRate(playbackRate);
 			}
 			dispatch('start');
@@ -354,7 +372,6 @@
 		on:error={handleError}
 		on:bufferEnd
 		on:buffer
-		on:startxxxxxxxxxxx
 		on:playbackRateChange
 		on:seek
 		on:playbackQualityChange
diff --git a/src/lib/Preview.svelte b/src/lib/Preview.svelte
index ba047b1..22825a8 100644
--- a/src/lib/Preview.svelte
+++ b/src/lib/Preview.svelte
@@ -3,28 +3,35 @@
 </script>
 
 <script lang="ts">
+	import type { PreviewDispatcher } from './types';
 	import { createEventDispatcher, onMount } from 'svelte';
 
 	export let previewTabIndex: number;
 	export let url: string;
 	export let light: boolean | string;
 	export let oEmbedUrl: string;
-	export let isCustomPlayIcon: boolean;
+	export let isElementLight: boolean;
+	export let playIcon: boolean;
 
-	let image: string | null = null;
+	const ICON_SIZE = '64px';
 
-	const dispatch = createEventDispatcher();
+	const dispatch = createEventDispatcher<PreviewDispatcher>();
 
-	const isElement = $$slots['light'];
-	const ICON_SIZE = '64px';
+	let image: string | null = null;
 
 	onMount(function () {
 		fetchImage({ url, light, oEmbedUrl });
 	});
 
+	function handleUrlLightChange(newUrl: typeof url, newLight: typeof light) {
+		fetchImage({ url: newUrl, light: newLight, oEmbedUrl });
+	}
+
+	$: handleUrlLightChange(url, light);
+
 	type FetchImageParams = { url: typeof url; light: typeof light; oEmbedUrl: typeof oEmbedUrl };
 	function fetchImage({ url, light, oEmbedUrl }: FetchImageParams) {
-		if (isElement) {
+		if (isElementLight) {
 			return;
 		}
 		if (typeof light === 'string') {
@@ -58,15 +65,34 @@
 		}
 	}
 
-	const flexCenter = 'display: flex; align-items: center; justify-content: center;';
-	$: preview = `width: 100%; height: 100%;${
-		image && !isElement ? `background-image: url(${image});` : ''
-	} background-size: cover; background-position: center; cursor: pointer; ${flexCenter}`;
-	$: shadow = `background: radial-gradient(rgb(0, 0, 0, 0.3), rgba(0, 0, 0, 0) 60%); border-radius: ${ICON_SIZE}; width: ${ICON_SIZE}; height: ${ICON_SIZE}; ${
-		isElement ? 'position: absolute;' : ''
-	} ${flexCenter}`;
-	const playIcon =
-		'border-style: solid; border-width: 16px 0 16px 26px; border-color: transparent transparent transparent white; margin-left: 7px;';
+	const flexCenter = `
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	`;
+	$: preview = `
+		width: 100%;
+		height: 100%;
+		${image && !isElementLight ? `background-image: url(${image});` : ''} 
+		background-size: cover;
+		background-position: center; 
+		cursor: pointer; 
+		${flexCenter}
+	`;
+	$: shadow = `
+		background: radial-gradient(rgb(0, 0, 0, 0.3), rgba(0, 0, 0, 0) 60%);
+		border-radius: ${ICON_SIZE};
+		width: ${ICON_SIZE};
+		height: ${ICON_SIZE};
+		${isElementLight ? 'position: absolute;' : ''}
+		${flexCenter}
+	`;
+	const playIconStyle = `
+		border-style: solid;
+		border-width: 16px 0 16px 26px;
+		border-color: transparent transparent transparent white;
+		margin-left: 7px;
+	`;
 </script>
 
 <div
@@ -80,9 +106,9 @@
 	<slot name="light" />
 	<slot name="play-icon" />
 
-	{#if !isCustomPlayIcon}
+	{#if !playIcon}
 		<div style={shadow} class="svelte-player__shadow">
-			<div style={playIcon} class="svelte-player__play-icon" />
+			<div style={playIconStyle} class="svelte-player__play-icon" />
 		</div>
 	{/if}
 </div>
diff --git a/src/lib/SveltePlayer.svelte b/src/lib/SveltePlayer.svelte
index 75c46ec..11d9ec6 100644
--- a/src/lib/SveltePlayer.svelte
+++ b/src/lib/SveltePlayer.svelte
@@ -1,13 +1,12 @@
 <script lang="ts">
-	import type {
-		PlayerRef,
-		SeekToType,
-		SveltePlayerDispatcher,
-		SveltePlayerRef,
-		PlayerKey
-	} from './types';
+	import type { PlayerMediaRef, SeekToType, SveltePlayerDispatcher } from './types';
 	import type { RecursivePartial } from './players/utility.types';
-	import type { InternalPlayerKey, FilePlayerUrl, Config } from './players/types';
+	import type {
+		PlayerUrl,
+		PlayerConfig,
+		PlayerConfigKey,
+		PlayerGetPlayerKey
+	} from './players/types';
 
 	import { createEventDispatcher } from 'svelte';
 	import merge from 'deepmerge';
@@ -17,7 +16,9 @@
 	import Preview from './Preview.svelte';
 	import { defaultConfig } from './props';
 
-	export let url: FilePlayerUrl;
+	export const someValue = 123;
+
+	export let url: PlayerUrl;
 	export let playing = false;
 	export let loop = false;
 	export let controls = false;
@@ -32,7 +33,7 @@
 	export let pip = false;
 	export let stopOnUnmount = true;
 	export let previewTabIndex = 0;
-	export let config: RecursivePartial<Config> = {};
+	export let config: RecursivePartial<PlayerConfig> = {};
 	export let oEmbedUrl = 'https://noembed.com/embed?url={url}';
 
 	export let progressFrequency: number | undefined = undefined;
@@ -40,10 +41,9 @@
 
 	const dispatch = createEventDispatcher<SveltePlayerDispatcher>();
 
-	let showPreviewState = !!light;
-	let playerRef: PlayerRef;
+	let playerRef: PlayerMediaRef;
 
-	export function canEnablePIP(url: FilePlayerUrl) {
+	export function canEnablePIP(url: PlayerUrl) {
 		for (const Player of [...players]) {
 			if (Player.canEnablePIP && Player.canEnablePIP(url)) {
 				return true;
@@ -52,20 +52,11 @@
 		return false;
 	}
 
-	function handlePropsLightChange(propsLight: typeof light) {
-		if (propsLight) {
-			showPreviewState = true;
-		}
-		if (!propsLight) {
-			showPreviewState = false;
-		}
-	}
-
-	$: handlePropsLightChange(light);
+	$: showPreviewState = !!light;
 
-	function handleClickPreview() {
+	function handleClickPreview(e: Event) {
 		showPreviewState = false;
-		dispatch('clickPreview');
+		dispatch('clickPreview', e);
 	}
 
 	export function showPreview() {
@@ -73,47 +64,47 @@
 	}
 
 	export function getDuration() {
-		if (!playerRef) return null;
+		if (!playerRef) {
+			return null;
+		}
 		return playerRef.getDuration();
 	}
 
 	export function getCurrentTime() {
-		if (!playerRef) return null;
+		if (!playerRef) {
+			return null;
+		}
 		return playerRef.getCurrentTime();
 	}
 
 	export function getSecondsLoaded() {
-		if (!playerRef) return null;
+		if (!playerRef) {
+			return null;
+		}
 		return playerRef.getSecondsLoaded();
 	}
 
-	export function getInternalPlayer(key: InternalPlayerKey = 'player') {
-		if (!playerRef) return null;
+	export function getInternalPlayer(key: PlayerGetPlayerKey = 'player') {
+		if (!playerRef) {
+			return null;
+		}
 		return playerRef.getInternalPlayer(key);
 	}
 
 	export function seekTo(fraction: number, type?: SeekToType, keepPlaying?: boolean) {
-		if (!playerRef) return null;
+		if (!playerRef) {
+			return null;
+		}
 		playerRef.seekTo(fraction, type, keepPlaying);
 	}
 
-	const sveltePlayer: SveltePlayerRef = {
-		showPreview,
-		canEnablePIP,
-		getCurrentTime,
-		getDuration,
-		getInternalPlayer,
-		getSecondsLoaded,
-		seekTo
-	};
-
 	function handleReady() {
-		dispatch('ready', sveltePlayer);
+		dispatch('ready');
 	}
 
-	function getConfig<T extends PlayerKey>(configUrl: FilePlayerUrl, configKey: T) {
-		const memoized = memoize<(url: typeof configUrl, key: T) => Config[T]>((_, key) => {
-			return merge<Config[T]>(defaultConfig[key] || {}, config[key] || {});
+	function getConfig<T extends PlayerConfigKey>(configUrl: PlayerUrl, configKey: T) {
+		const memoized = memoize<(url: typeof configUrl, key: T) => PlayerConfig[T]>((_, key) => {
+			return merge<PlayerConfig[T]>(defaultConfig[key] || {}, config[key] || {});
 		});
 
 		return memoized(configUrl, configKey);
@@ -123,13 +114,15 @@
 {#if showPreviewState}
 	{#if url}
 		<Preview
-			url={typeof url !== 'string' ? '' : url}
 			{light}
 			{previewTabIndex}
 			{oEmbedUrl}
-			isCustomPlayIcon={$$slots['play-icon']}
+			url={typeof url !== 'string' ? '' : url}
+			playIcon={$$slots['play-icon']}
+			isElementLight={$$slots['light']}
 			on:click={handleClickPreview}
 		>
+			<slot name="light" slot="light" />
 			<slot name="play-icon" slot="play-icon" />
 		</Preview>
 	{/if}
diff --git a/src/lib/players/DailyMotion.svelte b/src/lib/players/DailyMotion.svelte
index db2f810..c867c75 100644
--- a/src/lib/players/DailyMotion.svelte
+++ b/src/lib/players/DailyMotion.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { GlobalSDKDailyMotionKey } from './global.types';
 	import type { DailyMotionPlayer, DailyMotionSDKReady } from './dailymotion.global.types';
-	import type { Dispatcher } from './types';
+	import type { PlayerDispatcher } from './types';
 	import type { DailyMotionConfig } from './dailymotion.types';
 
 	import { onMount, createEventDispatcher } from 'svelte';
@@ -18,7 +18,7 @@
 	const SDK_GLOBAL: GlobalSDKDailyMotionKey = 'DM';
 	const SDK_GLOBAL_READY: DailyMotionSDKReady = 'dmAsyncInit';
 
-	const dispatch = createEventDispatcher<Dispatcher>();
+	const dispatch = createEventDispatcher<PlayerDispatcher>();
 
 	let container: HTMLDivElement;
 	let player: DailyMotionPlayer;
@@ -88,7 +88,7 @@
 		);
 	}
 
-	function onDurationChange() {
+	export function onDurationChange() {
 		const duration = getDuration();
 		dispatch('duration', duration);
 	}
diff --git a/src/lib/players/Facebook.svelte b/src/lib/players/Facebook.svelte
index 0efa6bb..3b72686 100644
--- a/src/lib/players/Facebook.svelte
+++ b/src/lib/players/Facebook.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { GlobalSDKFacebookKey } from './global.types';
 	import type { FacebookPlayer, FacebookSDKReady } from './facebook.global.types';
-	import type { Dispatcher } from './types';
+	import type { PlayerDispatcher } from './types';
 	import type { FacebookConfig } from './facebook.types';
 
 	import { onMount, createEventDispatcher } from 'svelte';
@@ -18,7 +18,7 @@
 	const SDK_GLOBAL_READY: FacebookSDKReady = 'fbAsyncInit';
 	const PLAYER_ID_PREFIX = 'facebook-player-';
 
-	const dispatch = createEventDispatcher<Dispatcher>();
+	const dispatch = createEventDispatcher<PlayerDispatcher>();
 
 	let player: FacebookPlayer;
 
diff --git a/src/lib/players/FilePlayer.svelte b/src/lib/players/FilePlayer.svelte
index f873c00..b3d37f9 100644
--- a/src/lib/players/FilePlayer.svelte
+++ b/src/lib/players/FilePlayer.svelte
@@ -1,20 +1,16 @@
 <script lang="ts">
-	import type {
-		GlobalSDKDASHKey,
-		GlobalSDKHLSKey,
-		GlobalSDKFLVKey,
-		GlobalSDKHLSClass
-	} from './global.types';
-	import type { FilePlayerUrl, Dispatcher } from './types';
-	import type { FileConfig, ShouldUseAudioParams, PlayerElement } from './file.types';
+	import type { GlobalSDKDASHKey, GlobalSDKHLSKey, GlobalSDKFLVKey } from './global.types';
+	import type { PlayerDispatcher } from './types';
+	import type { FileConfig, FilePlayerElement, FileUrl, FileInternalPlayerKey } from './file.types';
 	import type { DashJSMediaPlayerClass } from './dash.types';
 	import type { FlvJSPlayer } from './flv.types';
+	import type { HLSClass } from './hls.types';
 
-	import { onMount, createEventDispatcher, beforeUpdate, afterUpdate } from 'svelte';
+	import { onMount, createEventDispatcher } from 'svelte';
 	import { getSDK, isMediaStream, supportsWebKitPresentationMode } from './utils';
 	import { AUDIO_EXTENSIONS, HLS_EXTENSIONS, DASH_EXTENSIONS, FLV_EXTENSIONS } from './patterns';
 
-	export let url: FilePlayerUrl;
+	export let url: FileUrl;
 	export let playing: boolean;
 	export let loop: boolean;
 	export let controls: boolean;
@@ -47,14 +43,14 @@
 	const MATCH_CLOUDFLARE_STREAM = /https:\/\/watch\.cloudflarestream\.com\/([a-z0-9]+)/;
 	const REPLACE_CLOUDFLARE_STREAM = 'https://videodelivery.net/{id}/manifest/video.m3u8';
 
-	const dispatch = createEventDispatcher<Dispatcher>();
+	const dispatch = createEventDispatcher<PlayerDispatcher>();
 
-	let hls: GlobalSDKHLSClass | undefined = undefined;
+	let hls: HLSClass | undefined = undefined;
 	let dash: DashJSMediaPlayerClass | undefined = undefined;
 	let flv: FlvJSPlayer | undefined = undefined;
 
 	type Props = {
-		url: FilePlayerUrl;
+		url: FileUrl;
 		config: FileConfig;
 	};
 
@@ -66,7 +62,7 @@
 
 	$: handlePropsChange({ url, config });
 
-	function handlePlayerChange(newPlayer: PlayerElement, prevPlayer?: PlayerElement) {
+	function handlePlayerChange(newPlayer: FilePlayerElement, prevPlayer?: FilePlayerElement) {
 		const prevProps = propsHistory[0];
 		const currentProps = propsHistory[1];
 
@@ -85,9 +81,9 @@
 	}
 
 	type PlayerObjectType = 'player' | 'prevPlayer';
-	const playerObjectTarget: Record<PlayerObjectType, PlayerElement> = {} as Record<
+	const playerObjectTarget: Record<PlayerObjectType, FilePlayerElement> = {} as Record<
 		PlayerObjectType,
-		PlayerElement
+		FilePlayerElement
 	>;
 	const playerObjectHandler: ProxyHandler<typeof playerObjectTarget> = {
 		set(target, p, newValue) {
@@ -99,7 +95,7 @@
 			return true;
 		}
 	};
-	const playerObject = new Proxy<Record<PlayerObjectType, PlayerElement>>(
+	const playerObject = new Proxy<Record<PlayerObjectType, FilePlayerElement>>(
 		playerObjectTarget,
 		playerObjectHandler
 	);
@@ -121,7 +117,7 @@
 		};
 	});
 
-	function addListeners(playerParams: PlayerElement) {
+	function addListeners(playerParams: FilePlayerElement) {
 		playerParams.addEventListener('play', onPlay);
 		playerParams.addEventListener('waiting', onBuffer);
 		playerParams.addEventListener('playing', onBufferEnd);
@@ -144,7 +140,7 @@
 		}
 	}
 
-	function removeListeners(playerParams: PlayerElement, urlParams?: typeof url) {
+	function removeListeners(playerParams: FilePlayerElement, urlParams?: typeof url) {
 		playerParams.removeEventListener('canplay', onReady);
 		playerParams.removeEventListener('play', onPlay);
 		playerParams.removeEventListener('waiting', onBuffer);
@@ -223,6 +219,11 @@
 		dispatch('seek', (e.target as HTMLMediaElement).currentTime);
 	}
 
+	type ShouldUseAudioParams = {
+		url: FileUrl;
+		config: FileConfig;
+	};
+
 	function shouldUseAudio(props: ShouldUseAudioParams) {
 		if (props.config.forceVideo) {
 			return false;
@@ -233,7 +234,7 @@
 		return AUDIO_EXTENSIONS.test(String(props.url)) || props.config.forceAudio;
 	}
 
-	function shouldUseHLS(url: FilePlayerUrl): url is string {
+	function shouldUseHLS(url: FileUrl): url is string {
 		if ((IS_SAFARI && config.forceSafariHLS) || config.forceHLS) {
 			return true;
 		}
@@ -243,15 +244,15 @@
 		return HLS_EXTENSIONS.test(String(url)) || MATCH_CLOUDFLARE_STREAM.test(String(url));
 	}
 
-	function shouldUseDASH(url: FilePlayerUrl): url is string {
+	function shouldUseDASH(url: FileUrl): url is string {
 		return DASH_EXTENSIONS.test(String(url)) || config.forceDASH;
 	}
 
-	function shouldUseFLV(url: FilePlayerUrl): url is string {
+	function shouldUseFLV(url: FileUrl): url is string {
 		return FLV_EXTENSIONS.test(String(url)) || config.forceFLV;
 	}
 
-	export function load(loadUrl: FilePlayerUrl) {
+	export function load(loadUrl: FileUrl) {
 		const { hlsVersion, hlsOptions, dashVersion, flvVersion } = config;
 		if (hls) {
 			hls.destroy();
@@ -443,7 +444,7 @@
 		return end;
 	}
 
-	function getSource(url: FilePlayerUrl) {
+	function getSource(url: FileUrl) {
 		if (typeof url === 'string' && MATCH_DROPBOX_URL.test(url)) {
 			return url.replace('www.dropbox.com', 'dl.dropboxusercontent.com');
 		}
@@ -456,11 +457,22 @@
 		return url;
 	}
 
-	export function getPlayer(): PlayerElement {
-		return playerObject.player;
+	export function getPlayer(key?: FileInternalPlayerKey) {
+		switch (key) {
+			case 'dash':
+				return dash ?? null;
+			case 'flv':
+				return flv ?? null;
+			case 'hls':
+				return hls ?? null;
+			case 'player':
+				return playerObject.player ?? null;
+			default:
+				return null;
+		}
 	}
 
-	export function setPlayer(newPlayer: PlayerElement) {
+	export function setPlayer(newPlayer: FilePlayerElement) {
 		playerObject.player = newPlayer;
 	}
 
diff --git a/src/lib/players/Kaltura.svelte b/src/lib/players/Kaltura.svelte
index 3f00035..086eb27 100644
--- a/src/lib/players/Kaltura.svelte
+++ b/src/lib/players/Kaltura.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { GlobalSDKPlayerJSKey } from './global.types';
 	import type { PlayerJSPlayer } from './playerjs.global.types';
-	import type { Dispatcher } from './types';
+	import type { PlayerDispatcher } from './types';
 
 	import { onMount, createEventDispatcher } from 'svelte';
 	import { getSDK } from './utils';
@@ -13,7 +13,7 @@
 	const SDK_URL = 'https://cdn.embed.ly/player-0.1.0.min.js';
 	const SDK_GLOBAL: GlobalSDKPlayerJSKey = 'playerjs';
 
-	const dispatch = createEventDispatcher<Dispatcher>();
+	const dispatch = createEventDispatcher<PlayerDispatcher>();
 
 	let iframeContainer: HTMLIFrameElement;
 	let player: PlayerJSPlayer;
diff --git a/src/lib/players/Mixcloud.svelte b/src/lib/players/Mixcloud.svelte
index 5d13fa4..b86ea59 100644
--- a/src/lib/players/Mixcloud.svelte
+++ b/src/lib/players/Mixcloud.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { GlobalSDKMixcloudKey } from './global.types';
 	import type { MixcloudWidget } from './mixcloud.global.types';
-	import type { Dispatcher } from './types';
+	import type { PlayerDispatcher } from './types';
 	import type { MixcloudConfig } from './mixcloud.types';
 
 	import { onMount, createEventDispatcher } from 'svelte';
@@ -14,7 +14,7 @@
 	const SDK_URL = 'https://widget.mixcloud.com/media/js/widgetApi.js';
 	const SDK_GLOBAL: GlobalSDKMixcloudKey = 'Mixcloud';
 
-	const dispatch = createEventDispatcher<Dispatcher>();
+	const dispatch = createEventDispatcher<PlayerDispatcher>();
 
 	let iframeContainer: HTMLIFrameElement;
 	let player: MixcloudWidget;
diff --git a/src/lib/players/NotImplemented.svelte b/src/lib/players/NotImplemented.svelte
index a761fd4..0081a0c 100644
--- a/src/lib/players/NotImplemented.svelte
+++ b/src/lib/players/NotImplemented.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
 	import type { NotImplementedPlayer } from './notimplemented.global.types';
-	import type { FilePlayerUrl, Dispatcher } from './types';
+	import type { PlayerUrl, PlayerDispatcher } from './types';
 	import type { NotImplementedConfig } from './notimplemented.types';
 
 	import { onMount, createEventDispatcher } from 'svelte';
 
-	export const url: FilePlayerUrl | undefined = undefined;
+	export const url: PlayerUrl | undefined = undefined;
 	export const playing: boolean | undefined = undefined;
 	export const loop: boolean | undefined = undefined;
 	export const controls: boolean | undefined = undefined;
@@ -16,7 +16,7 @@
 	export const playsinline: boolean | undefined = undefined;
 	export const config: NotImplementedConfig | undefined = undefined;
 
-	const dispatch = createEventDispatcher<Dispatcher>();
+	const dispatch = createEventDispatcher<PlayerDispatcher>();
 
 	let player: NotImplementedPlayer;
 
@@ -24,7 +24,7 @@
 		dispatch('mount');
 	});
 
-	export function load(url: FilePlayerUrl, isReady?: boolean): void {
+	export function load(url: PlayerUrl, isReady?: boolean): void {
 		console.log('load');
 	}
 
diff --git a/src/lib/players/SoundCloud.svelte b/src/lib/players/SoundCloud.svelte
index e75a07b..f2a3f1f 100644
--- a/src/lib/players/SoundCloud.svelte
+++ b/src/lib/players/SoundCloud.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { GlobalSDKSoundCloudKey } from './global.types';
 	import type { SoundCloudPlayer } from './soundcloud.global.types';
-	import type { Dispatcher } from './types';
+	import type { PlayerDispatcher } from './types';
 	import type { SoundCloudConfig } from './soundcloud.types';
 
 	import { onMount, createEventDispatcher } from 'svelte';
@@ -15,7 +15,7 @@
 	const SDK_URL = 'https://w.soundcloud.com/player/api.js';
 	const SDK_GLOBAL: GlobalSDKSoundCloudKey = 'SC';
 
-	const dispatch = createEventDispatcher<Dispatcher>();
+	const dispatch = createEventDispatcher<PlayerDispatcher>();
 
 	let iframeContainer: HTMLIFrameElement;
 	let player: SoundCloudPlayer;
diff --git a/src/lib/players/Streamable.svelte b/src/lib/players/Streamable.svelte
index 289cf20..bea81cb 100644
--- a/src/lib/players/Streamable.svelte
+++ b/src/lib/players/Streamable.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { GlobalSDKPlayerJSKey } from './global.types';
 	import type { PlayerJSPlayer } from './playerjs.global.types';
-	import type { Dispatcher } from './types';
+	import type { PlayerDispatcher } from './types';
 
 	import { onMount, createEventDispatcher } from 'svelte';
 	import { getSDK } from './utils';
@@ -14,7 +14,7 @@
 	const SDK_URL = 'https://cdn.embed.ly/player-0.1.0.min.js';
 	const SDK_GLOBAL: GlobalSDKPlayerJSKey = 'playerjs';
 
-	const dispatch = createEventDispatcher<Dispatcher>();
+	const dispatch = createEventDispatcher<PlayerDispatcher>();
 
 	let iframeContainer: HTMLIFrameElement;
 	let player: PlayerJSPlayer;
diff --git a/src/lib/players/Twitch.svelte b/src/lib/players/Twitch.svelte
index 88f4dc3..6864249 100644
--- a/src/lib/players/Twitch.svelte
+++ b/src/lib/players/Twitch.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { GlobalSDKTwitchKey } from './global.types';
-	import type { TwitchPlayer, TwitchPlayerLinkOption } from './twitch.global.types';
-	import type { Dispatcher } from './types';
+	import type { TwitchPlayer } from './twitch.global.types';
+	import type { PlayerDispatcher } from './types';
 	import type { TwitchConfig } from './twitch.types';
 
 	import { onMount, createEventDispatcher } from 'svelte';
@@ -18,7 +18,7 @@
 	const SDK_GLOBAL: GlobalSDKTwitchKey = 'Twitch';
 	const PLAYER_ID_PREFIX = 'twitch-player-';
 
-	const dispatch = createEventDispatcher<Dispatcher>();
+	const dispatch = createEventDispatcher<PlayerDispatcher>();
 
 	let player: TwitchPlayer;
 
diff --git a/src/lib/players/Vidyard.svelte b/src/lib/players/Vidyard.svelte
index f40f8d4..86e81bb 100644
--- a/src/lib/players/Vidyard.svelte
+++ b/src/lib/players/Vidyard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { GlobalSDKVidyardKey } from './global.types';
 	import type { VidyardSDKReady, VidyardPlayer } from './vidyard.global.types';
-	import type { Dispatcher } from './types';
+	import type { PlayerDispatcher } from './types';
 	import type { VidyardConfig } from './vidyard.types';
 
 	import { onMount, createEventDispatcher } from 'svelte';
@@ -17,7 +17,7 @@
 	const SDK_GLOBAL: GlobalSDKVidyardKey = 'VidyardV4';
 	const SDK_GLOBAL_READY: VidyardSDKReady = 'onVidyardAPI';
 
-	const dispatch = createEventDispatcher<Dispatcher>();
+	const dispatch = createEventDispatcher<PlayerDispatcher>();
 
 	let container: HTMLDivElement;
 	let player: VidyardPlayer;
diff --git a/src/lib/players/Vimeo.svelte b/src/lib/players/Vimeo.svelte
index 2efefa3..465313a 100644
--- a/src/lib/players/Vimeo.svelte
+++ b/src/lib/players/Vimeo.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { GlobalSDKVimeoKey } from './global.types';
 	import type { VimeoPlayer } from './vimeo.global.types';
-	import type { Dispatcher } from './types';
+	import type { PlayerDispatcher } from './types';
 	import type { ViemoConfig } from './vimeo.types';
 
 	import { onMount, createEventDispatcher } from 'svelte';
@@ -22,7 +22,7 @@
 		return url.replace('/manage/videos', '');
 	}
 
-	const dispatch = createEventDispatcher<Dispatcher>();
+	const dispatch = createEventDispatcher<PlayerDispatcher>();
 
 	let container: HTMLDivElement;
 	let player: VimeoPlayer;
diff --git a/src/lib/players/Wistia.svelte b/src/lib/players/Wistia.svelte
index 60cb324..690bb0c 100644
--- a/src/lib/players/Wistia.svelte
+++ b/src/lib/players/Wistia.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { GlobalSDKWistiaKey } from './global.types';
 	import type { WistiaPlayer } from './wistia.global.types';
-	import type { Dispatcher } from './types';
+	import type { PlayerDispatcher } from './types';
 	import type { WistiaConfig } from './wistia.types';
 
 	import { onMount, createEventDispatcher } from 'svelte';
@@ -18,7 +18,7 @@
 	const SDK_GLOBAL: GlobalSDKWistiaKey = 'Wistia';
 	const PLAYER_ID_PREFIX = 'wistia-player-';
 
-	const dispatch = createEventDispatcher<Dispatcher>();
+	const dispatch = createEventDispatcher<PlayerDispatcher>();
 
 	let player: WistiaPlayer;
 
diff --git a/src/lib/players/YouTube.svelte b/src/lib/players/YouTube.svelte
index 454e882..ea4875f 100644
--- a/src/lib/players/YouTube.svelte
+++ b/src/lib/players/YouTube.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import type { GlobalSDKYTKey } from './global.types';
 	import type { YTPlayer, YTPlayerOnStateChangeEvent, YTSDKReady } from './youtube.global.types';
-	import type { Dispatcher } from './types';
-	import type { ParsePlaylistFn, YouTubeConfig } from './youtube.types';
+	import type { PlayerDispatcher } from './types';
+	import type { ParsePlaylistFn, YouTubeConfig, YouTubeUrl } from './youtube.types';
 
 	import { createEventDispatcher, onMount } from 'svelte';
 	import { MATCH_URL_YOUTUBE } from './patterns';
@@ -15,17 +15,13 @@
 	export let config: YouTubeConfig;
 	export let display: string | undefined = undefined;
 
-	const playerVars = config?.playerVars;
-	const embedOptions = config?.embedOptions;
-	const onUnstarted = config?.onUnstarted;
-
 	const SDK_URL = 'https://www.youtube.com/iframe_api';
 	const SDK_GLOBAL: GlobalSDKYTKey = 'YT';
 	const SDK_GLOBAL_READY: YTSDKReady = 'onYouTubeIframeAPIReady';
 	const MATCH_PLAYLIST = /[?&](?:list|channel)=([a-zA-Z0-9_-]+)/;
 	const MATCH_USER_UPLOADS = /user\/([a-zA-Z0-9_-]+)\/?/;
 
-	const dispatch = createEventDispatcher<Dispatcher>();
+	const dispatch = createEventDispatcher<PlayerDispatcher>();
 
 	let container: HTMLDivElement;
 	let player: YTPlayer;
@@ -34,14 +30,15 @@
 		dispatch('mount');
 	});
 
-	function getID(url: string | string[]) {
+	function getID(url: YouTubeUrl) {
 		if (!url || url instanceof Array || MATCH_PLAYLIST.test(url)) {
 			return null;
 		}
 		return url.match(MATCH_URL_YOUTUBE)?.[1] ?? null;
 	}
 
-	export function load(url: string | string[], isReady?: boolean) {
+	export function load(url: YouTubeUrl, isReady?: boolean) {
+		const { playerVars, embedOptions } = config;
 		const id = String(getID(url));
 		if (isReady) {
 			if (url instanceof Array || MATCH_PLAYLIST.test(url) || MATCH_USER_UPLOADS.test(url)) {
@@ -51,8 +48,8 @@
 			}
 			player.cueVideoById({
 				videoId: id,
-				startSeconds: parseStartTime(url) || playerVars?.start,
-				endSeconds: parseEndTime(url) || playerVars?.end
+				startSeconds: parseStartTime(url) || playerVars.start,
+				endSeconds: parseEndTime(url) || playerVars.end
 			});
 			return;
 		}
@@ -113,7 +110,7 @@
 		}
 	}
 
-	function parsePlaylist(url: string | string[]): ReturnType<ParsePlaylistFn> {
+	function parsePlaylist(url: YouTubeUrl): ReturnType<ParsePlaylistFn> {
 		if (url instanceof Array) {
 			return {
 				listType: 'playlist',
@@ -139,9 +136,10 @@
 
 	export function onStateChange(event: YTPlayerOnStateChangeEvent) {
 		const { data } = event;
+		const { playerVars, onUnstarted } = config;
 		const { UNSTARTED, PLAYING, PAUSED, BUFFERING, ENDED, CUED } = window[SDK_GLOBAL].PlayerState;
 		if (data === UNSTARTED) {
-			onUnstarted?.();
+			onUnstarted();
 		}
 		if (data === PLAYING) {
 			dispatch('play');
@@ -157,7 +155,7 @@
 			const isPlaylist = !!player.getPlaylist();
 			// Only loop manually if not playing a playlist
 			if (loop && !isPlaylist) {
-				if (playerVars?.start) {
+				if (playerVars.start) {
 					seekTo(playerVars.start);
 				} else {
 					play();
diff --git a/src/lib/players/file.types.ts b/src/lib/players/file.types.ts
index 3bd984b..b76ff2d 100644
--- a/src/lib/players/file.types.ts
+++ b/src/lib/players/file.types.ts
@@ -3,9 +3,15 @@ import type {
 	HTMLAudioAttributes,
 	HTMLTrackAttributes
 } from 'svelte/elements';
-import type { FilePlayerUrl } from './types';
 
-import type { HlsConfig } from './hls.types';
+import type { GlobalSDKFLV, GlobalSDKHLS } from './global.types';
+import type { HlsConfig, HLSClass, ErrorData } from './hls.types';
+import type { DashJSMediaPlayerClass } from './dash.types';
+import type { FlvJSPlayer } from './flv.types';
+
+export type FileMedia = { src: string; type: string };
+
+export type FileUrl = string | FileMedia[] | MediaStream;
 
 export type FileConfigAttributes = Omit<HTMLVideoAttributes | HTMLAudioAttributes, `on:${string}`>;
 
@@ -25,9 +31,16 @@ export type FileConfig = {
 	forceSafariHLS?: boolean;
 };
 
-export type ShouldUseAudioParams = {
-	url: FilePlayerUrl;
-	config: FileConfig;
-};
+export type FilePlayerElement = HTMLAudioElement | HTMLVideoElement;
+
+export type FilePlayer = FilePlayerElement;
+
+export type FileInternalPlayerKey = 'player' | 'hls' | 'dash' | 'flv';
+
+export type FileInternalPlayer = HLSClass | DashJSMediaPlayerClass | FlvJSPlayer | FilePlayer;
+
+export type FileErrorData = ErrorData;
+
+export type FileErrorSDKInstance = HLSClass | FlvJSPlayer;
 
-export type PlayerElement = HTMLAudioElement | HTMLVideoElement;
+export type FileErrorSDKGlobal = GlobalSDKFLV | GlobalSDKHLS;
diff --git a/src/lib/players/global.types.ts b/src/lib/players/global.types.ts
index a2b99a2..8c6bcce 100644
--- a/src/lib/players/global.types.ts
+++ b/src/lib/players/global.types.ts
@@ -8,62 +8,111 @@ import type { Vimeo } from './vimeo.global.types';
 import type { PlayerJS } from './playerjs.global.types';
 import type { Wistia } from './wistia.global.types';
 import type { Vidyard, VidyardSDKReady } from './vidyard.global.types';
-import type { HlsJS, Hls } from './hls.types';
+import type { HlsJS } from './hls.types';
 import type { DashJS } from './dash.types';
 import type { FlvJS } from './flv.types';
 
-export type GlobalSDK = {
-	YT: YT;
-	SC: SoundCloud;
-	Vimeo: Vimeo;
-	FB: Facebook;
-	playerjs: PlayerJS;
-	Wistia: Wistia;
-	Twitch: Twitch;
-	DM: DailyMotion;
-	Mixcloud: MixcloudPlayer;
-	VidyardV4: Vidyard;
-	Hls: HlsJS;
-	dashjs: DashJS;
-	flvjs: FlvJS;
+export type GlobalSDKYTKey = 'YT';
+export type GlobalSDKYT = YT;
+type GlobalSDKYTObject = {
+	[k in GlobalSDKYTKey]: GlobalSDKYT;
 };
 
-export type GlobalSDKType = keyof GlobalSDK;
+export type GlobalSDKSoundCloudKey = 'SC';
+export type GlobalSDKSoundCloud = SoundCloud;
+type GlobalSDKSoundCloudObject = {
+	[k in GlobalSDKSoundCloudKey]: GlobalSDKSoundCloud;
+};
+
+export type GlobalSDKVimeoKey = 'Vimeo';
+export type GlobalSDKVimeo = Vimeo;
+type GlobalSDKVimeoObject = {
+	[k in GlobalSDKVimeoKey]: GlobalSDKVimeo;
+};
 
-export type GlobalSDKYTKey = Extract<GlobalSDKType, 'YT'>;
-export type GlobalSDKSoundCloudKey = Extract<GlobalSDKType, 'SC'>;
-export type GlobalSDKVimeoKey = Extract<GlobalSDKType, 'Vimeo'>;
-export type GlobalSDKFacebookKey = Extract<GlobalSDKType, 'FB'>;
-export type GlobalSDKPlayerJSKey = Extract<GlobalSDKType, 'playerjs'>;
-export type GlobalSDKWistiaKey = Extract<GlobalSDKType, 'Wistia'>;
-export type GlobalSDKTwitchKey = Extract<GlobalSDKType, 'Twitch'>;
-export type GlobalSDKDailyMotionKey = Extract<GlobalSDKType, 'DM'>;
-export type GlobalSDKMixcloudKey = Extract<GlobalSDKType, 'Mixcloud'>;
-export type GlobalSDKVidyardKey = Extract<GlobalSDKType, 'VidyardV4'>;
-export type GlobalSDKHLSKey = Extract<GlobalSDKType, 'Hls'>;
-export type GlobalSDKDASHKey = Extract<GlobalSDKType, 'dashjs'>;
-export type GlobalSDKFLVKey = Extract<GlobalSDKType, 'flvjs'>;
+export type GlobalSDKFacebookKey = 'FB';
+export type GlobalSDKFacebook = Facebook;
+type GlobalSDKFacebookObject = {
+	[k in GlobalSDKFacebookKey]: GlobalSDKFacebook;
+};
+
+export type GlobalSDKPlayerJSKey = 'playerjs';
+export type GlobalSDKPlayerJS = PlayerJS;
+type GlobalSDKPlayerJSObject = {
+	[k in GlobalSDKPlayerJSKey]: GlobalSDKPlayerJS;
+};
+
+export type GlobalSDKWistiaKey = 'Wistia';
+export type GlobalSDKWistia = Wistia;
+type GlobalSDKWistiaObject = {
+	[k in GlobalSDKWistiaKey]: GlobalSDKWistia;
+};
+
+export type GlobalSDKTwitchKey = 'Twitch';
+export type GlobalSDKTwitch = Twitch;
+type GlobalSDKTwitchObject = {
+	[k in GlobalSDKTwitchKey]: GlobalSDKTwitch;
+};
+
+export type GlobalSDKDailyMotionKey = 'DM';
+export type GlobalSDKDailyMotion = DailyMotion;
+type GlobalSDKDailyMotionObject = {
+	[k in GlobalSDKDailyMotionKey]: GlobalSDKDailyMotion;
+};
 
+export type GlobalSDKMixcloudKey = 'Mixcloud';
+export type GlobalSDKMixcloud = MixcloudPlayer;
+type GlobalSDKMixcloudObject = {
+	[k in GlobalSDKMixcloudKey]: GlobalSDKMixcloud;
+};
+
+export type GlobalSDKVidyardKey = 'VidyardV4';
+export type GlobalSDKVidyard = Vidyard;
+type GlobalSDKVidyardObject = {
+	[k in GlobalSDKVidyardKey]: GlobalSDKVidyard;
+};
+
+export type GlobalSDKHLSKey = 'Hls';
+export type GlobalSDKHLS = HlsJS;
+type GlobalSDKHLSObject = {
+	[k in GlobalSDKHLSKey]: GlobalSDKHLS;
+};
+
+export type GlobalSDKDASHKey = 'dashjs';
+export type GlobalSDKDASH = DashJS;
+type GlobalSDKDASHObject = {
+	[k in GlobalSDKDASHKey]: GlobalSDKDASH;
+};
+
+export type GlobalSDKFLVKey = 'flvjs';
+export type GlobalSDKFLV = FlvJS;
+type GlobalSDKFLVObject = {
+	[k in GlobalSDKFLVKey]: GlobalSDKFLV;
+};
+
+export type GlobalSDK = GlobalSDKYTObject &
+	GlobalSDKSoundCloudObject &
+	GlobalSDKVimeoObject &
+	GlobalSDKFacebookObject &
+	GlobalSDKPlayerJSObject &
+	GlobalSDKWistiaObject &
+	GlobalSDKTwitchObject &
+	GlobalSDKDailyMotionObject &
+	GlobalSDKMixcloudObject &
+	GlobalSDKVidyardObject &
+	GlobalSDKHLSObject &
+	GlobalSDKDASHObject &
+	GlobalSDKFLVObject;
+
+export type GlobalSDKType = keyof GlobalSDK;
 export type GlobalSDKValue = GlobalSDK[GlobalSDKType];
 
-export type GlobalSDKYT = Extract<GlobalSDKValue, YT>;
-export type GlobalSDKSoundCloud = Extract<GlobalSDKValue, SoundCloud>;
-export type GlobalSDKVimeo = Extract<GlobalSDKValue, Vimeo>;
-export type GlobalSDKFacebook = Extract<GlobalSDKValue, Facebook>;
-export type GlobalSDKPlayerJS = Extract<GlobalSDKValue, PlayerJS>;
-export type GlobalSDKWistia = Extract<GlobalSDKValue, Wistia>;
-export type GlobalSDKTwitch = Extract<GlobalSDKValue, Twitch>;
-export type GlobalSDKDailyMotion = Extract<GlobalSDKValue, DailyMotion>;
-export type GlobalSDKMixcloud = Extract<GlobalSDKValue, MixcloudPlayer>;
-export type GlobalSDKVidyard = Extract<GlobalSDKValue, Vidyard>;
-export type GlobalSDKHLSClass = Hls;
-export type GlobalSDKHLS = Extract<GlobalSDKValue, HlsJS>;
-export type GlobalSDKDASH = Extract<GlobalSDKValue, DashJS>;
-export type GlobalSDKFLV = Extract<GlobalSDKValue, FlvJS>;
-
-export type GlobalSDKReady = YTSDKReady | DailyMotionSDKReady | FacebookSDKReady | VidyardSDKReady;
-
-export type GlobalSDKYTReady = Extract<GlobalSDKReady, YTSDKReady>;
-export type GlobalSDKDailyMotionReady = Extract<GlobalSDKReady, DailyMotionSDKReady>;
-export type GlobalSDKFacebookReady = Extract<GlobalSDKReady, FacebookSDKReady>;
-export type GlobalSDKVidyardReady = Extract<GlobalSDKReady, VidyardSDKReady>;
+export type GlobalSDKYTReady = YTSDKReady;
+export type GlobalSDKDailyMotionReady = DailyMotionSDKReady;
+export type GlobalSDKFacebookReady = FacebookSDKReady;
+export type GlobalSDKVidyardReady = VidyardSDKReady;
+export type GlobalSDKReady =
+	| GlobalSDKYTReady
+	| GlobalSDKDailyMotionReady
+	| GlobalSDKFacebookReady
+	| GlobalSDKVidyardReady;
diff --git a/src/lib/players/hls.types.ts b/src/lib/players/hls.types.ts
index 2d8f107..32c352b 100644
--- a/src/lib/players/hls.types.ts
+++ b/src/lib/players/hls.types.ts
@@ -1,6 +1,8 @@
 import type Hls from 'hls.js';
-export type { default as Hls, HlsConfig } from 'hls.js';
+export type { HlsConfig, ErrorData } from 'hls.js';
 
-type TypeOfHls = typeof Hls;
+export type HlsJS = typeof Hls;
 
-export type HlsJS = TypeOfHls;
+export type HLSClass = Hls;
+
+export type HlsInternalPlayerKey = 'hls';
diff --git a/src/lib/players/index.ts b/src/lib/players/index.ts
index 91fb4d5..d946c08 100644
--- a/src/lib/players/index.ts
+++ b/src/lib/players/index.ts
@@ -1,4 +1,4 @@
-import type { FilePlayerUrl, Player } from './types';
+import type { PlayerUrl, Player } from './types';
 import {
 	canPlayYoutube,
 	canPlayFile,
@@ -132,7 +132,7 @@ const players: Player[] = [
 		canPlay: canPlayFile,
 		loopOnEnded: undefined,
 		forceLoad: undefined,
-		canEnablePIP(url: FilePlayerUrl) {
+		canEnablePIP(url: PlayerUrl) {
 			return (
 				canPlayFile(url) &&
 				(document.pictureInPictureEnabled || supportsWebKitPresentationMode()) &&
diff --git a/src/lib/players/mixcloud.global.types.ts b/src/lib/players/mixcloud.global.types.ts
index 27a4d52..d01d131 100644
--- a/src/lib/players/mixcloud.global.types.ts
+++ b/src/lib/players/mixcloud.global.types.ts
@@ -27,14 +27,14 @@ export type MixcloudWidgetProgressEVENTCallback = (seconds: number, duration: nu
 export type MixcloudWidgetErrorßEVENTCallback = (error: unknown) => void;
 
 export type MixcloudWidgetProgressEVENT = {
-	[l in Extract<MixcloudPlayerEVENT, MixcloudPROGRESSEvent>]: {
+	[l in MixcloudPROGRESSEvent]: {
 		on(callback: MixcloudWidgetProgressEVENTCallback): void;
 		off(callback: MixcloudWidgetEVENTCallback): void;
 	};
 };
 
 export type MixcloudWidgetErrorEVENT = {
-	[l in Extract<MixcloudPlayerEVENT, MixcloudERROREvent>]: {
+	[l in MixcloudERROREvent]: {
 		on(callback: MixcloudWidgetErrorßEVENTCallback): void;
 		off(callback: MixcloudWidgetEVENTCallback): void;
 	};
diff --git a/src/lib/players/patterns.ts b/src/lib/players/patterns.ts
index b1e6a7d..1cde501 100644
--- a/src/lib/players/patterns.ts
+++ b/src/lib/players/patterns.ts
@@ -1,4 +1,5 @@
-import type { FilePlayerUrl } from './types';
+import type { YouTubeUrl } from './youtube.types';
+import type { PlayerUrl } from './types';
 
 import { isMediaStream, isBlobUrl } from './utils';
 
@@ -30,7 +31,7 @@ export const HLS_EXTENSIONS = /\.(m3u8)($|\?)/i;
 export const DASH_EXTENSIONS = /\.(mpd)($|\?)/i;
 export const FLV_EXTENSIONS = /\.(flv)($|\?)/i;
 
-export function canPlayYoutube(url: string | string[]) {
+export function canPlayYoutube(url: YouTubeUrl) {
 	if (url instanceof Array) {
 		return url.every((item) => MATCH_URL_YOUTUBE.test(item));
 	}
@@ -77,7 +78,7 @@ export function canPlayKaltura(url: string) {
 	return MATCH_URL_KALTURA.test(url);
 }
 
-export function canPlayFile(url: FilePlayerUrl) {
+export function canPlayFile(url: PlayerUrl) {
 	if (url instanceof Array) {
 		for (const item of url) {
 			if (typeof item === 'string' && canPlayFile(item)) {
diff --git a/src/lib/players/soundcloud.global.types.ts b/src/lib/players/soundcloud.global.types.ts
index c093c72..3666a0e 100644
--- a/src/lib/players/soundcloud.global.types.ts
+++ b/src/lib/players/soundcloud.global.types.ts
@@ -65,16 +65,12 @@ export type SoundCloudPlayerBindCallbackParams = {
 
 export type SoundCloudPlayerBindCallbackFn = (params: SoundCloudPlayerBindCallbackParams) => void;
 
-// TODO: Fix the any / unknown types
 export type SoundCloudPlayer = {
 	bind(
 		event: Exclude<SoundCloudPlayerEVENT, SoundCloudUIERROREvent>,
 		listener: SoundCloudPlayerBindCallbackFn
 	): void;
-	bind(
-		event: Extract<SoundCloudPlayerEVENT, SoundCloudUIERROREvent>,
-		listener: (e: unknown) => void
-	): void;
+	bind(event: SoundCloudUIERROREvent, listener: (e: unknown) => void): void; // TODO: Fix the unknown types
 	unbind(event: SoundCloudPlayerEVENT): void;
 	load(url: string, options?: Partial<SoundCloudPlayerLoadOptions>): void;
 	play(): void;
diff --git a/src/lib/players/twitch.global.types.ts b/src/lib/players/twitch.global.types.ts
index d3274d8..7b6717d 100644
--- a/src/lib/players/twitch.global.types.ts
+++ b/src/lib/players/twitch.global.types.ts
@@ -110,10 +110,7 @@ export interface TwitchPlayer {
 		event: Exclude<TwitchPlayerEVENT, TwitchPlayerSEEKEvent>,
 		callback: TwitchPlayerEVENTCallback
 	): void;
-	addEventListener(
-		event: Extract<TwitchPlayerEVENT, TwitchPlayerSEEKEvent>,
-		callback: TwitchPlayerSEEKEVENTCallback
-	): void;
+	addEventListener(event: TwitchPlayerSEEKEvent, callback: TwitchPlayerSEEKEVENTCallback): void;
 }
 
 export interface TwitchPlayerConstructor {
diff --git a/src/lib/players/types.ts b/src/lib/players/types.ts
index e49bcae..f129b76 100644
--- a/src/lib/players/types.ts
+++ b/src/lib/players/types.ts
@@ -12,7 +12,7 @@ import type { VimeoPlayer } from './vimeo.global.types';
 import type { PlayerJSPlayer } from './playerjs.global.types';
 import type { WistiaPlayer } from './wistia.global.types';
 import type { VidyardPlayer } from './vidyard.global.types';
-import type { YouTubeConfig } from './youtube.types';
+import type { YouTubeConfig, YouTubeUrl } from './youtube.types';
 import type { SoundCloudConfig } from './soundcloud.types';
 import type { ViemoConfig } from './vimeo.types';
 import type { FacebookConfig } from './facebook.types';
@@ -21,14 +21,22 @@ import type { TwitchConfig } from './twitch.types';
 import type { DailyMotionConfig } from './dailymotion.types';
 import type { MixcloudConfig } from './mixcloud.types';
 import type { VidyardConfig } from './vidyard.types';
-import type { FileConfig } from './file.types';
+import type {
+	FileConfig,
+	FileUrl,
+	FilePlayer,
+	FileErrorData,
+	FileErrorSDKInstance,
+	FileErrorSDKGlobal,
+	FileInternalPlayer,
+	FileInternalPlayerKey
+} from './file.types';
 import type { NotImplementedConfig } from './notimplemented.types';
 
 export type PlayerInstance =
 	| YTPlayer
 	| TwitchPlayer
-	| HTMLAudioElement
-	| HTMLVideoElement
+	| FilePlayer
 	| NotImplementedPlayer
 	| SoundCloudPlayer
 	| DailyMotionPlayer
@@ -39,6 +47,8 @@ export type PlayerInstance =
 	| WistiaPlayer
 	| VidyardPlayer;
 
+export type PlayerInternalPlayer = PlayerInstance | FileInternalPlayer;
+
 export type PlayerKey =
 	| 'youtube'
 	| 'soundcloud'
@@ -54,18 +64,7 @@ export type PlayerKey =
 	| 'file'
 	| 'not-implemented';
 
-export type Player = {
-	key: PlayerKey;
-	loopOnEnded?: boolean;
-	forceLoad?: boolean;
-	canPlay(url: FilePlayerUrl): boolean;
-	canEnablePIP?(url: FilePlayerUrl): boolean;
-	loadComponent(): Promise<{
-		default: Constructor<SvelteComponent<Partial<PlayerProps>> & PlayerMedia>;
-	}>;
-};
-
-export type GetPlayerReturn = PlayerInstance | null;
+export type PlayerUrl = string | YouTubeUrl | FileUrl;
 
 export type OnProgressProps = {
 	played: number;
@@ -74,15 +73,21 @@ export type OnProgressProps = {
 	loadedSeconds?: number;
 };
 
+export type ErrorData = FileErrorData;
+
+export type ErrorSDKInstance = FileErrorSDKInstance;
+
+export type ErrorSDKGlobal = FileErrorSDKGlobal;
+
 // TODO: to implement corrent type
 export type OnErrorProps = {
 	error: unknown;
-	data?: unknown;
-	sdkInstance?: unknown;
-	sdkGlobal?: unknown;
+	data?: ErrorData | unknown;
+	sdkInstance?: ErrorSDKInstance;
+	sdkGlobal?: ErrorSDKGlobal;
 };
 
-export type Dispatcher = {
+export type PlayerDispatcher = {
 	ready: undefined | Event;
 	mount: undefined;
 	start: undefined;
@@ -103,13 +108,7 @@ export type Dispatcher = {
 	loaded: undefined;
 };
 
-export type InternalPlayerKey = 'player' | 'hls' | 'dash';
-
-export type FileMediaUrl = { src: string; type: string };
-
-export type FilePlayerUrl = string | string[] | FileMediaUrl[] | MediaStream;
-
-export type Config = {
+export type PlayerConfig = {
 	youtube: YouTubeConfig;
 	soundcloud: SoundCloudConfig;
 	vimeo: ViemoConfig;
@@ -125,8 +124,12 @@ export type Config = {
 	'not-implemented': NotImplementedConfig;
 };
 
+export type PlayerConfigKey = keyof PlayerConfig;
+
+export type PlayerConfigObject = PlayerConfig[PlayerConfigKey];
+
 export type PlayerProps = {
-	url: FilePlayerUrl;
+	url: PlayerUrl;
 	playing: boolean;
 	loop: boolean;
 	controls: boolean;
@@ -141,14 +144,17 @@ export type PlayerProps = {
 	pip: boolean;
 	stopOnUnmount: boolean;
 	previewTabIndex: number;
-	config: RecursivePartial<Config[keyof Config]>;
+	config: RecursivePartial<PlayerConfigObject>;
 	oEmbedUrl: string;
 	display: string;
 };
 
-export type PlayerMedia = {
-	load(url: FilePlayerUrl, isReady?: boolean): void;
+export type PlayerGetPlayerKey = 'player' | FileInternalPlayerKey;
+
+export type PlayerRef = {
+	load(url: PlayerUrl, isReady?: boolean): void;
 	stop(): void;
+	onDurationChange?(): void;
 	play(): void;
 	pause(): void;
 	setVolume(fraction: number): void;
@@ -162,6 +168,19 @@ export type PlayerMedia = {
 	setLoop?(loop: boolean): void;
 	enablePIP?(): void;
 	disablePIP?(): void;
-	getPlayer?(): GetPlayerReturn;
-	setPlayer?(palyer: GetPlayerReturn): void;
+	getPlayer(key?: PlayerGetPlayerKey): PlayerInternalPlayer | null;
+	setPlayer?(palyer: PlayerInternalPlayer): void;
+};
+
+export type PlayerComponent = Constructor<SvelteComponent<Partial<PlayerProps>> & PlayerRef>;
+
+export type Player = {
+	key: PlayerKey;
+	loopOnEnded?: boolean;
+	forceLoad?: boolean;
+	canPlay(url: PlayerUrl): boolean;
+	canEnablePIP?(url: PlayerUrl): boolean;
+	loadComponent(): Promise<{
+		default: PlayerComponent;
+	}>;
 };
diff --git a/src/lib/players/utility.types.ts b/src/lib/players/utility.types.ts
index 8482e37..b611997 100644
--- a/src/lib/players/utility.types.ts
+++ b/src/lib/players/utility.types.ts
@@ -21,7 +21,7 @@ export type Prettify<T> = {
 // https://stackoverflow.com/a/70428144/12976234
 export type PickMatching<T, V> = { [K in keyof T as T[K] extends V ? K : never]: T[K] };
 /* eslint-disable-next-line @typescript-eslint/ban-types -- TODO: Comment this*/
-export type ExtractMethods<T> = PickMatching<T, Function>;
+export type ObjectMethods<T> = PickMatching<T, Function>;
 
 export type MethodParameters<T> = T extends (...args: infer P) => any ? P : never;
 
diff --git a/src/lib/players/utils.ts b/src/lib/players/utils.ts
index 82b9a50..7d4cfbd 100644
--- a/src/lib/players/utils.ts
+++ b/src/lib/players/utils.ts
@@ -20,8 +20,8 @@ import type {
 	GlobalSDKVidyard
 } from './global.types';
 import type { WistiaWQ } from './wistia.global.types';
-import type { FilePlayerUrl, PlayerInstance } from './types';
-import type { ExtractMethods, MethodParameters, MethodReturnType } from './utility.types';
+import type { PlayerUrl, PlayerInstance } from './types';
+import type { ObjectMethods, MethodParameters, MethodReturnType } from './utility.types';
 import loadScript from 'load-script';
 
 declare global {
@@ -54,7 +54,7 @@ const MATCH_NUMERIC = /^\d+$/;
 
 // Parse YouTube URL for a start time param, ie ?t=1h14m30s
 // and return the start time in seconds
-function parseTimeParam(url: FilePlayerUrl, pattern: RegExp) {
+function parseTimeParam(url: PlayerUrl, pattern: RegExp) {
 	if (typeof url !== 'string') {
 		return undefined;
 	}
@@ -84,11 +84,11 @@ function parseTimeString(stamp: string) {
 	return seconds;
 }
 
-export function parseStartTime(url: FilePlayerUrl) {
+export function parseStartTime(url: PlayerUrl) {
 	return parseTimeParam(url, MATCH_START_QUERY);
 }
 
-export function parseEndTime(url: FilePlayerUrl) {
+export function parseEndTime(url: PlayerUrl) {
 	return parseTimeParam(url, MATCH_END_QUERY);
 }
 
@@ -164,8 +164,8 @@ export function getSDK<T extends GlobalSDKType>(
 
 export function callPlayer<TPlayer extends PlayerInstance>(player?: TPlayer) {
 	return function <
-		TObject extends ExtractMethods<Required<TPlayer>>,
-		TMethodKey extends keyof ExtractMethods<Required<TPlayer>>,
+		TObject extends ObjectMethods<Required<TPlayer>>,
+		TMethodKey extends keyof ObjectMethods<Required<TPlayer>>,
 		TMethod extends TObject[TMethodKey],
 		TParams extends MethodParameters<TMethod>,
 		TReturn extends MethodReturnType<TMethod>
@@ -188,7 +188,7 @@ export function callPlayer<TPlayer extends PlayerInstance>(player?: TPlayer) {
 	};
 }
 
-export function isMediaStream(url: FilePlayerUrl): url is MediaStream {
+export function isMediaStream(url: PlayerUrl): url is MediaStream {
 	return (
 		typeof window !== 'undefined' &&
 		typeof window.MediaStream !== 'undefined' &&
diff --git a/src/lib/players/wistia.global.types.ts b/src/lib/players/wistia.global.types.ts
index c8bc2a4..5823c1d 100644
--- a/src/lib/players/wistia.global.types.ts
+++ b/src/lib/players/wistia.global.types.ts
@@ -490,7 +490,7 @@ export type WistiaPlayerControlClassOptionalProperties = {
 };
 
 export type WistiaPlayerControlClassOptionalFunctions = {
-	shouldMount(video: WistiaPlayerControllVideo): boolean; // TODO: fix `any` type
+	shouldMount(video: WistiaPlayerControllVideo): boolean;
 };
 
 export type WistiaPlayerControlClassProperties = WistiaPlayerControlClassRequiredProperties &
diff --git a/src/lib/players/youtube.types.ts b/src/lib/players/youtube.types.ts
index 79adf4b..3168cbf 100644
--- a/src/lib/players/youtube.types.ts
+++ b/src/lib/players/youtube.types.ts
@@ -5,7 +5,9 @@ import type {
 	YTPlayerOptions
 } from './youtube.global.types';
 
-export type ParsePlaylistFn = (url: string | string[]) =>
+export type YouTubeUrl = string | string[];
+
+export type ParsePlaylistFn = (url: YouTubeUrl) =>
 	| {
 			listType: YTListPlaylistType;
 			list: string;
diff --git a/src/lib/props.ts b/src/lib/props.ts
index 1838895..7f21cbb 100644
--- a/src/lib/props.ts
+++ b/src/lib/props.ts
@@ -1,7 +1,7 @@
-import type { Config } from './players/types';
+import type { PlayerConfig } from './players/types';
 import { noop } from './players/utils';
 
-export const defaultConfig: Config = {
+export const defaultConfig: PlayerConfig = {
 	soundcloud: {
 		options: {
 			visual: true,
diff --git a/src/lib/types.ts b/src/lib/types.ts
index fff4090..0b3c2ce 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -1,39 +1,24 @@
-import type { SvelteComponent } from 'svelte';
-import type {
-	InternalPlayerKey,
-	Dispatcher,
-	FilePlayerUrl,
-	PlayerInstance,
-	PlayerMedia,
-	PlayerProps,
-	Config
-} from './players/types';
+import type { PlayerDispatcher, PlayerUrl, PlayerInternalPlayer } from './players/types';
 
 export type SeekToType = 'seconds' | 'fraction';
 
-export type PlayerDispatcher = Dispatcher & {
-	ready: undefined;
-};
-
-export type PlayerRef = {
+export type PlayerMediaRef = {
 	getDuration(): number | null;
 	getCurrentTime(): number | null;
 	getSecondsLoaded(): number | null;
-	getInternalPlayer(key?: InternalPlayerKey): PlayerInstance | null;
+	getInternalPlayer(key?: string): PlayerInternalPlayer | null;
 	seekTo(amount: number, type?: SeekToType, keepPlaying?: boolean): void;
 };
 
-export type SveltePlayerDispatcher = Omit<Dispatcher, 'ready'> & {
-	ready: PlayerRef;
-	onClickPreview: null;
+export type PreviewDispatcher = {
+	click?: Event;
 };
 
-export type SveltePlayerRef = PlayerRef & {
-	canEnablePIP(url: FilePlayerUrl): boolean;
+export type SveltePlayerRef = PlayerMediaRef & {
+	canEnablePIP(url: PlayerUrl): boolean;
 	showPreview(): void;
 };
 
-export type PlayerKey = keyof Config;
-export type PlayerConfig = Config[keyof Config];
-
-export type PlayerMediaRef = SvelteComponent<Partial<PlayerProps>> & PlayerMedia;
+export type SveltePlayerDispatcher = PlayerDispatcher & {
+	clickPreview: Event;
+};
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 04462fb..dce94d1 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -58,12 +58,12 @@
 	}
 
 	function handlePlay() {
-		console.log('onPlay');
+		// console.log('onPlay');
 		playing = true;
 	}
 
 	function handlePause() {
-		console.log('onPause');
+		// console.log('onPause');
 		playing = false;
 	}
 
@@ -80,7 +80,7 @@
 
 	function handleProgress(event: CustomEvent<OnProgressProps>) {
 		const state = event.detail;
-		console.log('onProgress', state);
+		// console.log('onProgress', state);
 		// We only want to update time slider if we are not currently seeking
 		if (!seeking && state.loaded !== undefined && state.played !== undefined) {
 			loaded = state.loaded;
@@ -89,12 +89,12 @@
 	}
 
 	function handleEnded() {
-		console.log('onEnded');
+		// console.log('onEnded');
 		playing = loop;
 	}
 
 	function handleDuration(event: CustomEvent<number | null>) {
-		console.log('onDuration', event.detail);
+		// console.log('onDuration', event.detail);
 		duration = event.detail ?? 0;
 	}
 
@@ -118,28 +118,28 @@
 				{pip}
 				bind:this={playerRef}
 				on:ready={() => {
-					console.log('onReady');
+					// console.log('onReady');
 				}}
 				on:start={() => {
-					console.log('onStart');
+					// console.log('onStart');
 				}}
 				on:play={handlePlay}
 				on:pause={handlePause}
 				on:buffer={() => {
-					console.log('onBuffer');
+					// console.log('onBuffer');
 				}}
 				on:playbackRateChange={handleOnPlaybackRateChange}
 				on:seek={(e) => {
-					console.log('onSeek', e);
+					// console.log('onSeek', e);
 				}}
 				on:ended={handleEnded}
 				on:error={(e) => {
-					console.log('onError', e);
+					// console.log('onError', e);
 				}}
 				on:progress={handleProgress}
 				on:duration={handleDuration}
 				on:playbackQualityChange={(e) => {
-					console.log('onPlaybackQualityChange', e);
+					// console.log('onPlaybackQualityChange', e);
 				}}
 			/>
 		</div>
diff --git a/src/test/helpers/testPlayerMethods.ts b/src/test/helpers/testPlayerMethods.ts
index bde029d..89acb2a 100644
--- a/src/test/helpers/testPlayerMethods.ts
+++ b/src/test/helpers/testPlayerMethods.ts
@@ -1,69 +1,46 @@
 import type { SpyInstance } from 'vitest';
 import type { SvelteComponent, ComponentProps } from 'svelte';
-import type { PlayerMedia } from '../../lib/types';
-import type { GlobalSDK } from '../../lib/players/global.types';
+import type { PlayerRef, PlayerInstance } from '../../lib/players/types';
+import type { Constructor, ObjectMethods } from '../../lib/players/utility.types';
 
 import { vi, test, expect } from 'vitest';
-import { render, waitFor } from '@testing-library/svelte';
-import * as utils from '../../lib/players/utils';
-
-type Constructor<T> = new (...args: any[]) => T;
+import { render } from '@testing-library/svelte';
 
 type SvelteComponentOptions<C extends SvelteComponent> =
 	| ComponentProps<C>
 	| { props: ComponentProps<C> };
 
-type Methods = {
-	[k in keyof Partial<Omit<PlayerMedia, 'load'>>]: string | null;
-};
-
-type TestPlayerMethodParams<C extends SvelteComponent> = {
-	Player: Constructor<C>;
-	loadParameters: Parameters<PlayerMedia['load']>;
-	props?: SvelteComponentOptions<C>;
-	playerSDK: GlobalSDK[keyof GlobalSDK];
-	methods: Methods;
+type Methods<TPlayer extends PlayerInstance> = {
+	[k in keyof Partial<Omit<PlayerRef, 'load'>>]: keyof ObjectMethods<TPlayer> | null;
 };
 
-export default function <C extends SvelteComponent>({
-	Player,
-	props,
-	loadParameters,
-	methods,
-	playerSDK
-}: TestPlayerMethodParams<C>) {
-	test(`${Player.name} Methods`, async () => {
-		const getSDK = vi.spyOn(utils, 'getSDK').mockImplementation(async () => {
-			return playerSDK;
-		});
-
-		const instance = render(Player, props).component;
-		instance.load(...loadParameters);
+export default function <TComponent extends SvelteComponent, TPlayer extends PlayerInstance>(
+	PlayerComponent: Constructor<TComponent>,
+	player: TPlayer,
+	methods: Methods<TPlayer>,
+	props?: SvelteComponentOptions<TComponent>
+) {
+	for (const method of Object.keys(methods)) {
+		test(`${method}`, async (t) => {
+			const instance = render(PlayerComponent, props).component;
+			t.expect(instance[method]).toBeTruthy();
+			instance.setPlayer(player);
+			const playerMethod = methods[method as keyof Methods<TPlayer>];
 
-		await waitFor(() => {
-			expect(instance.getPlayer()).not.toBeNull();
-		});
-
-		const player = instance.getPlayer();
-
-		for (const method of Object.keys(methods)) {
 			let methodSpy: SpyInstance | undefined = undefined;
-			const methodName = methods[method as keyof Methods];
-
-			if (methodName) {
-				methodSpy = vi.spyOn(player, methodName).mockImplementation(() => {
-					return undefined;
+			if (playerMethod) {
+				// TODO: fix type and async implementation
+				methodSpy = vi.spyOn(player as any, playerMethod as string).mockImplementation(async () => {
+					return vi.fn();
 				});
 			}
 
 			instance[method]();
 
-			if (methodSpy !== undefined) {
+			if (methodSpy) {
 				expect(methodSpy).toHaveBeenCalled();
 				methodSpy.mockRestore();
 			}
-		}
-
-		getSDK.mockRestore();
-	});
+		});
+	}
 }
diff --git a/src/test/helpers/wait.ts b/src/test/helpers/wait.ts
new file mode 100644
index 0000000..47913bc
--- /dev/null
+++ b/src/test/helpers/wait.ts
@@ -0,0 +1,8 @@
+export async function wait(callback: () => void, timeout: number) {
+	await new Promise((resolve) => {
+		setTimeout(() => {
+			callback();
+			resolve(undefined);
+		}, timeout);
+	});
+}
diff --git a/src/test/players/DailyMotion.test.ts b/src/test/players/DailyMotion.test.ts
index 182ac2e..a0949f9 100644
--- a/src/test/players/DailyMotion.test.ts
+++ b/src/test/players/DailyMotion.test.ts
@@ -1,15 +1,17 @@
-import type { DailyMotionPlayer, DailyMotion } from '../../lib/players/dailymotion.global.types';
 import type { DailyMotionConfig } from '../../lib/players/dailymotion.types';
 
-import { describe } from 'vitest';
-import testPlayerMethods from '../helpers/testPlayerMethods';
-
+import { describe, test, vi, expect, beforeEach } from 'vitest';
+import { render } from '@testing-library/svelte';
+import * as utils from '../../lib/players/utils';
 import DailyMotionSvelte from '../../lib/players/DailyMotion.svelte';
+import testPlayerMethods from '../helpers/testPlayerMethods';
+import DailyMotionPlayerMock from './DailyMotionPlayer.mock';
 
-const TEST_URL = 'https://www.dailymotion.com/video/x5e9eog';
-const TEST_CONFIG: DailyMotionConfig = {
+const TEST_VIDEO_ID = 'x5e9eog';
+const TEST_URL = `https://www.dailymotion.com/video/${TEST_VIDEO_ID}`;
+const TEST_CONFIG = {
 	params: {}
-};
+} satisfies DailyMotionConfig;
 
 const TEST_PROPS = {
 	config: TEST_CONFIG,
@@ -18,52 +20,154 @@ const TEST_PROPS = {
 	playing: false
 };
 
-class DailyMotionPlayerMock implements DailyMotionPlayer {
-	bufferedTime = 0;
-	currentTime = 0;
-	duration = 0;
+beforeEach(() => {
+	vi.restoreAllMocks();
+});
 
-	constructor() {
-		// do nothing
-	}
-	load() {
-		// do nothing
-	}
-	pause() {
-		// do nothing
-	}
-	play() {
-		// do nothing
-	}
-	seek() {
-		// do nothing
-	}
-	setMuted() {
-		// do nothing
-	}
-	setVolume() {
-		// do nothing
+describe('testPlayerMethods', () => {
+	testPlayerMethods(DailyMotionSvelte, new DailyMotionPlayerMock(), {
+		play: 'play',
+		pause: 'pause',
+		stop: null,
+		seekTo: 'seek',
+		setVolume: 'setVolume',
+		mute: 'setMuted',
+		unmute: 'setMuted'
+	});
+});
+
+test.only('load()', async (t) => {
+	t.expect.assertions(4);
+	vi.doMock('./DailyMotionPlayer.mock', () => {
+		const Player = vi.fn((container, options) => {
+			t.expect(container.tagName).toStrictEqual('DIV');
+			t.expect(options.video).toStrictEqual(TEST_VIDEO_ID);
+			t.expect(true).toBeTruthy();
+		});
+
+		return { default: Player };
+	});
+
+	const Player = (await import('./DailyMotionPlayer.mock')).default;
+	const getSDK = vi.spyOn(utils, 'getSDK').mockImplementation(async () => {
+		return { player: Player };
+	});
+
+	const instance = new DailyMotionSvelte({
+		target: document.body,
+		props: TEST_PROPS
+	});
+	instance.load(TEST_URL);
+
+	t.expect(getSDK).toHaveBeenCalledOnce();
+	getSDK.mockRestore();
+	return Promise.resolve();
+});
+
+// TODO: Add test for this, this behaciour cannot
+// be tested yet because we can't set container
+// programmatically
+test('load() - no container', async (t) => {
+	t.expect(true).toStrictEqual(true);
+});
+
+test('load() - existing player', async (t) => {
+	vi.doMock('./DailyMotionPlayer.mock', () => {
+		const Player = vi.fn();
+		Player.prototype.load = vi.fn();
+
+		return { default: Player };
+	});
+
+	const Player = (await import('./DailyMotionPlayer.mock')).default;
+
+	const instance = new DailyMotionSvelte({
+		target: document.body,
+		props: TEST_PROPS
+	});
+	instance.setPlayer(new Player());
+	instance.load(TEST_URL);
+	t.expect(instance.getPlayer().load).toHaveBeenCalledWith(TEST_VIDEO_ID, expect.anything());
+});
+
+test('onDurationChange()', async (t) => {
+	vi.doMock('./DailyMotionPlayer.mock', () => {
+		const Player = vi.fn();
+		Player.prototype.duration = 10;
+
+		return { default: Player };
+	});
+
+	const Player = (await import('./DailyMotionPlayer.mock')).default;
+
+	function onDuration(duration: CustomEvent<number | null>) {
+		t.expect(duration.detail).toStrictEqual(10);
 	}
-}
 
-const DAILYMOTION_SDK: DailyMotion = {
-	player: DailyMotionPlayerMock
-};
+	const instance = new DailyMotionSvelte({
+		target: document.body,
+		props: TEST_PROPS
+	});
+	instance.$on('duration', onDuration);
+	instance.setPlayer(new Player());
+	instance.onDurationChange();
+});
 
-describe('testPlayerMethods', () => {
-	testPlayerMethods({
-		Player: DailyMotionSvelte,
-		playerSDK: DAILYMOTION_SDK,
-		loadParameters: [TEST_URL],
-		methods: {
-			play: 'play',
-			pause: 'pause',
-			stop: null,
-			seekTo: 'seek',
-			setVolume: 'setVolume',
-			mute: 'setMuted',
-			unmute: 'setMuted'
-		},
+test('getDuration()', async (t) => {
+	vi.doMock('./DailyMotionPlayer.mock', () => {
+		const Player = vi.fn();
+		Player.prototype.duration = 10;
+
+		return { default: Player };
+	});
+
+	const Player = (await import('./DailyMotionPlayer.mock')).default;
+
+	const instance = new DailyMotionSvelte({
+		target: document.body,
 		props: TEST_PROPS
 	});
+	instance.setPlayer(new Player());
+	t.expect(instance.getDuration()).toStrictEqual(10);
+});
+
+test('getCurrentTime()', async (t) => {
+	vi.doMock('./DailyMotionPlayer.mock', () => {
+		const Player = vi.fn();
+		Player.prototype.currentTime = 5;
+
+		return { default: Player };
+	});
+
+	const Player = (await import('./DailyMotionPlayer.mock')).default;
+
+	const instance = new DailyMotionSvelte({
+		target: document.body,
+		props: TEST_PROPS
+	});
+	instance.setPlayer(new Player());
+	t.expect(instance.getCurrentTime()).toStrictEqual(5);
+});
+
+test('getSecondsLoaded()', async (t) => {
+	vi.doMock('./DailyMotionPlayer.mock', () => {
+		const Player = vi.fn();
+		Player.prototype.bufferedTime = 5;
+
+		return { default: Player };
+	});
+
+	const Player = (await import('./DailyMotionPlayer.mock')).default;
+
+	const instance = new DailyMotionSvelte({
+		target: document.body,
+		props: TEST_PROPS
+	});
+	instance.setPlayer(new Player());
+	t.expect(instance.getSecondsLoaded()).toStrictEqual(5);
+});
+
+test('render()', (t) => {
+	const wrapper = render(DailyMotionSvelte, TEST_PROPS);
+	t.expect(wrapper.container.querySelector('.dailymotion-player')).not.toStrictEqual(null);
 });
diff --git a/src/test/players/DailyMotionPlayer.mock.ts b/src/test/players/DailyMotionPlayer.mock.ts
new file mode 100644
index 0000000..fefe734
--- /dev/null
+++ b/src/test/players/DailyMotionPlayer.mock.ts
@@ -0,0 +1,31 @@
+import type { DailyMotionPlayer } from '../../lib/players/dailymotion.global.types';
+
+class DailyMotionPlayerMock implements DailyMotionPlayer {
+	bufferedTime = 0;
+	currentTime = 0;
+	duration = 0;
+
+	constructor() {
+		// do nothing
+	}
+	load() {
+		// do nothing
+	}
+	pause() {
+		// do nothing
+	}
+	play() {
+		// do nothing
+	}
+	seek() {
+		// do nothing
+	}
+	setMuted() {
+		// do nothing
+	}
+	setVolume() {
+		// do nothing
+	}
+}
+
+export default DailyMotionPlayerMock;
diff --git a/src/test/players/Facebook.test.ts b/src/test/players/Facebook.test.ts
index 933194c..c4912df 100644
--- a/src/test/players/Facebook.test.ts
+++ b/src/test/players/Facebook.test.ts
@@ -1,19 +1,22 @@
-import type { Facebook, FacebookPlayer } from '../../lib/players/facebook.global.types';
+import type { Facebook } from '../../lib/players/facebook.global.types';
 import type { FacebookConfig } from '../../lib/players/facebook.types';
 
-import { describe, vi } from 'vitest';
-import testPlayerMethods from '../helpers/testPlayerMethods';
+import { describe, vi, test, expect } from 'vitest';
+import { render } from '@testing-library/svelte';
 
 import * as utils from '../../lib/players/utils';
 import FacebookSvelte from '../../lib/players/Facebook.svelte';
 
+import testPlayerMethods from '../helpers/testPlayerMethods';
+import facebookPlayer from './FacebookPlayer.mock';
+
 const TEST_URL = 'https://www.facebook.com/facebook/videos/10153231379946729';
-const TEST_CONFIG: FacebookConfig = {
+const TEST_CONFIG = {
 	appId: '123',
 	version: 'v3.3',
 	playerId: 'facebook-player',
 	attributes: {}
-};
+} satisfies FacebookConfig;
 
 const TEST_PROPS = {
 	controls: false,
@@ -23,70 +26,11 @@ const TEST_PROPS = {
 	config: TEST_CONFIG
 };
 
-const FACEBOOK_INSTANCE: FacebookPlayer = {
-	getCurrentPosition() {
-		return 0;
-	},
-	getDuration() {
-		return 0;
-	},
-	getVolume() {
-		return 0;
-	},
-	isMuted() {
-		return false;
-	},
-	mute() {
-		// do nothing
-	},
-	pause() {
-		// do nothing
-	},
-	play() {
-		// do nothing
-	},
-	seek() {
-		// do nothing
-	},
-	setVolume() {
-		// do nothing
-	},
-	subscribe() {
-		return {
-			release() {
-				// do nothing
-			}
-		};
-	},
-	unmute() {
-		// do nothing
-	}
-};
-
-const FACEBOOK_SDK: Facebook = {
-	init: utils.noop,
-	Event: {
-		subscribe: vi.fn().mockImplementation((event, fn) => {
-			if (event === 'xfbml.ready') {
-				fn({
-					type: 'video',
-					id: TEST_CONFIG.playerId,
-					instance: FACEBOOK_INSTANCE
-				});
-			}
-		})
-	},
-	XFBML: {
-		parse: utils.noop
-	}
-};
-
 describe('testPlayerMethods', () => {
-	testPlayerMethods({
-		Player: FacebookSvelte,
-		playerSDK: FACEBOOK_SDK,
-		loadParameters: [TEST_URL, false],
-		methods: {
+	testPlayerMethods(
+		FacebookSvelte,
+		facebookPlayer,
+		{
 			play: 'play',
 			pause: 'pause',
 			stop: null,
@@ -98,6 +42,80 @@ describe('testPlayerMethods', () => {
 			getCurrentTime: 'getCurrentPosition',
 			getSecondsLoaded: null
 		},
+		TEST_PROPS
+	);
+});
+
+test('load()', async (t) => {
+	t.expect.assertions(2);
+	const FACEBOOK_SDK: Facebook = {
+		init: function () {
+			return null;
+		},
+		Event: {
+			subscribe: vi.fn().mockImplementation((event, fn) => {
+				if (event === 'xfbml.ready') {
+					fn({
+						type: 'video',
+						id: TEST_CONFIG.playerId,
+						instance: facebookPlayer
+					});
+				}
+			})
+		},
+		XFBML: t.expect.anything()
+	};
+
+	const getSDK = vi.spyOn(utils, 'getSDK').mockImplementation(async () => {
+		return FACEBOOK_SDK;
+	});
+
+	function onReady() {
+		t.expect(true).toBeTruthy();
+	}
+
+	const instance = new FacebookSvelte({
+		target: document.body,
 		props: TEST_PROPS
 	});
+
+	instance.$on('ready', onReady);
+	instance.load(TEST_URL);
+	t.expect(getSDK).toHaveBeenCalled();
+	getSDK.mockRestore();
+
+	await Promise.resolve();
+});
+
+test.only('load() when ready', async (t) => {
+	t.expect.assertions(2);
+	const FACEBOOK_SDK: Facebook = {
+		init: expect.anything(),
+		Event: expect.anything(),
+		XFBML: {
+			parse: function () {
+				t.expect(true).toBeTruthy();
+			}
+		}
+	};
+
+	const getSDK = vi.spyOn(utils, 'getSDK').mockImplementation(async () => {
+		return FACEBOOK_SDK;
+	});
+
+	const instance = new FacebookSvelte({
+		target: document.body,
+		props: TEST_PROPS
+	});
+
+	instance.load(TEST_URL, true);
+	t.expect(getSDK).toHaveBeenCalled();
+	getSDK.mockRestore();
+
+	await Promise.resolve();
+});
+
+test('render()', (t) => {
+	const wrapper = render(FacebookSvelte, TEST_PROPS);
+	t.expect(wrapper.container.querySelector('.facebook-player')).not.toStrictEqual(null);
 });
diff --git a/src/test/players/FacebookPlayer.mock.ts b/src/test/players/FacebookPlayer.mock.ts
new file mode 100644
index 0000000..5238321
--- /dev/null
+++ b/src/test/players/FacebookPlayer.mock.ts
@@ -0,0 +1,43 @@
+import type { FacebookPlayer } from '../../lib/players/facebook.global.types';
+
+const facebookPlayer: FacebookPlayer = {
+	getCurrentPosition() {
+		return 0;
+	},
+	getDuration() {
+		return 0;
+	},
+	getVolume() {
+		return 0;
+	},
+	isMuted() {
+		return false;
+	},
+	mute() {
+		// do nothing
+	},
+	pause() {
+		// do nothing
+	},
+	play() {
+		// do nothing
+	},
+	seek() {
+		// do nothing
+	},
+	setVolume() {
+		// do nothing
+	},
+	subscribe() {
+		return {
+			release() {
+				// do nothing
+			}
+		};
+	},
+	unmute() {
+		// do nothing
+	}
+};
+
+export default facebookPlayer;
diff --git a/src/test/players/FilePlayer.test.ts b/src/test/players/FilePlayer.test.ts
index efb9f17..4ce44ae 100644
--- a/src/test/players/FilePlayer.test.ts
+++ b/src/test/players/FilePlayer.test.ts
@@ -1,285 +1,487 @@
-import type { FileConfig } from '../../lib/players/file.types';
-import type { DashJS, DashJSDebugLogLevel } from '../../lib/players/dash.types';
-
-import { test, beforeAll, afterAll, vi, expect } from 'vitest';
-
-import { defaultConfig } from '../../lib/props';
-import * as utils from '../../lib/players/utils';
-import FilePlayerSvelte from '../../lib/players/FilePlayer.svelte';
-
-const wait = async (callback: () => void, timeout: number) => {
-	await new Promise((resolve) => {
-		setTimeout(() => {
-			callback();
-			resolve(undefined);
-		}, timeout);
-	});
-};
-
-const TEST_CONFIG: FileConfig = defaultConfig.file;
-
-const TEST_PROPS = {
-	playing: false,
-	loop: false,
-	controls: false,
-	muted: false,
-	width: '640px',
-	height: '360px',
-	playsinline: false,
-	config: TEST_CONFIG
-};
-
-class MockMediaStream {}
-
-beforeAll(() => {
-	vi.stubGlobal('navigator', {});
-
-	vi.stubGlobal('window', {
-		MediaStream: MockMediaStream,
-		URL: {
-			createObjectURL: () => 'mockObjectURL'
-		}
-	});
-});
-
-afterAll(() => {
-	vi.unstubAllGlobals();
-});
-
-test('load - hls', async (t) => {
-	vi.doMock('hls.js', () => {
-		class Hls {
-			static Events = { ERROR: 'ERROR' };
-			on() {
-				return null;
-			}
-			loadSource() {
-				return null;
-			}
-			attachMedia() {
-				return null;
-			}
-		}
-
-		return { default: Hls };
-	});
-
-	const Hls = (await import('hls.js')).default;
-
-	const url = 'file.m3u8';
-	const getSDK = vi.spyOn(utils, 'getSDK').mockImplementation(async () => {
-		return Hls;
-	});
-	const instance = new FilePlayerSvelte({
-		target: document.body,
-		props: {
-			url,
-			...TEST_PROPS
-		}
-	});
-
-	const onLoaded = vi.fn();
-	instance.$on('loaded', onLoaded);
-	instance.load(url);
-	t.expect(getSDK).toHaveBeenCalledOnce();
-	await expect(
-		wait(() => {
-			t.expect(onLoaded).toHaveBeenCalledOnce();
-		}, 100)
-	).resolves.toEqual(undefined);
-	getSDK.mockRestore();
-});
-
-test('onError - hls', async (t) => {
-	vi.doMock('hls.js', () => {
-		class Hls {
-			static Events = { ERROR: 'ERROR' };
-			on(event: string, cb: () => void) {
-				if (event === 'ERROR') {
-					setTimeout(cb, 100);
-				}
-			}
-
-			loadSource() {
-				return null;
-			}
-			attachMedia() {
-				return null;
-			}
-		}
-
-		return { default: Hls };
-	});
-
-	const Hls = (await import('hls.js')).default;
-
-	const getSDK = vi.spyOn(utils, 'getSDK').mockImplementation(async () => {
-		return Hls;
-	});
-
-	const url = 'file.m3u8';
-	const instance = new FilePlayerSvelte({
-		target: document.body,
-		props: {
-			url,
-			...TEST_PROPS
-		}
-	});
-
-	const onError = vi.fn();
-	instance.$on('error', onError);
-	instance.load(url);
-	t.expect(getSDK).toHaveBeenCalledOnce();
-	await expect(
-		wait(() => {
-			t.expect(onError).toHaveBeenCalledOnce();
-		}, 200)
-	).resolves.toEqual(undefined);
-	getSDK.mockRestore();
-});
-
-test('onError - flv', async (t) => {
-	vi.doMock('flv.js', () => {
-		class FlvPlayer {
-			attachMediaElement() {
-				// do nothing
-			}
-
-			on(event: string, cb: (...args: unknown[]) => void) {
-				if (event === 'error') {
-					setTimeout(() => {
-						cb({ error: event });
-					}, 100);
-				}
-			}
-
-			load() {
-				// do nothing
-			}
-		}
-
-		class FlvJS {
-			static Events = { ERROR: 'error' };
-
-			loadSource() {
-				return null;
-			}
-			attachMedia() {
-				return null;
-			}
-			static createPlayer() {
-				return new FlvPlayer();
-			}
-		}
-
-		return { default: FlvJS };
-	});
-
-	const flv = (await import('flv.js')).default;
-
-	const getSDK = vi.spyOn(utils, 'getSDK').mockImplementation(async () => {
-		return flv;
-	});
-
-	const url = 'file.flv';
-	const instance = new FilePlayerSvelte({
-		target: document.body,
-		props: {
-			url,
-			...TEST_PROPS
-		}
-	});
-
-	const onError = vi.fn();
-	instance.$on('error', onError);
-	instance.load(url);
-	t.expect(getSDK).toHaveBeenCalledOnce();
-	await expect(
-		wait(() => {
-			t.expect(onError).toHaveBeenCalledOnce();
-		}, 200)
-	).resolves.toEqual(undefined);
-	getSDK.mockRestore();
-});
-
-test('load - dash', async (t) => {
-	vi.doMock('dashjs', () => {
-		const dashjs = {
-			MediaPlayer() {
-				return {
-					create() {
-						return {
-							on() {
-								return null;
-							},
-							initialize() {
-								return null;
-							},
-							getDebug() {
-								return {
-									setLogToBrowserConsole() {
-										return null;
-									}
-								};
-							},
-							updateSettings() {
-								return null;
-							}
-						};
-					}
-				};
-			}
-		};
-
-		return { default: dashjs };
-	});
-
-	const dashjsSDK = (await import('dashjs')).default;
-	const dashjs: DashJS = {
-		...dashjsSDK,
-		Debug: {
-			LOG_LEVEL_NONE: 0,
-			LOG_LEVEL_FATAL: 1,
-			LOG_LEVEL_ERROR: 2,
-			LOG_LEVEL_WARNING: 3,
-			LOG_LEVEL_INFO: 4,
-			LOG_LEVEL_DEBUG: 5
-		}
-	};
-
-	const url = 'file.mpd';
-	const getSDK = vi.spyOn(utils, 'getSDK').mockImplementation(async () => {
-		return dashjs;
-	});
-	const instance = new FilePlayerSvelte({
-		target: document.body,
-		props: {
-			url,
-			...TEST_PROPS
-		}
-	});
-
-	const onLoaded = vi.fn();
-	instance.$on('loaded', onLoaded);
-	instance.load(url);
-	t.expect(getSDK).toHaveBeenCalledOnce();
-	await expect(
-		wait(() => {
-			t.expect(onLoaded).toHaveBeenCalledOnce();
-		}, 100)
-	).resolves.toEqual(undefined);
-	getSDK.mockRestore();
-});
-
-test('load - MediaStream', async (t) => {
-	const url = new window.MediaStream();
-	const instance = new FilePlayerSvelte({
-		target: document.body,
-		props: {
-			url,
-			...TEST_PROPS
-		}
-	});
-
-	instance.load(url);
-});
+// import type { HTMLVideoAttributes } from 'svelte/elements';
+// import type { MediaPlayerClass } from 'dashjs';
+// import type {
+// 	FileConfig,
+// 	FilePlayerElement,
+// 	FileInternalPlayer
+// } from '../../lib/players/file.types';
+// import type { DashJS, DashJSDebugLogLevel } from '../../lib/players/dash.types';
+
+import { test, beforeAll, afterAll, vi, expect, type SpyInstance } from 'vitest';
+// import { render } from '@testing-library/svelte';
+
+// import { defaultConfig } from '../../lib/props';
+// import * as utils from '../../lib/players/utils';
+// import FilePlayerSvelte from '../../lib/players/FilePlayer.svelte';
+// import { wait } from '../helpers/wait';
+
+// const dashDebug: DashJSDebugLogLevel = {
+// 	LOG_LEVEL_NONE: 0,
+// 	LOG_LEVEL_FATAL: 1,
+// 	LOG_LEVEL_ERROR: 2,
+// 	LOG_LEVEL_WARNING: 3,
+// 	LOG_LEVEL_INFO: 4,
+// 	LOG_LEVEL_DEBUG: 5
+// };
+
+// const TEST_CONFIG: FileConfig = defaultConfig.file;
+
+// const TEST_PROPS = {
+// 	playing: false,
+// 	loop: false,
+// 	controls: false,
+// 	muted: false,
+// 	width: '640px',
+// 	height: '360px',
+// 	playsinline: false,
+// 	config: TEST_CONFIG
+// };
+
+// class MockMediaStream {}
+
+// beforeAll(() => {
+// 	vi.stubGlobal('navigator', {});
+
+// 	vi.stubGlobal('window', {
+// 		MediaStream: MockMediaStream,
+// 		URL: {
+// 			createObjectURL() {
+// 				return 'mockObjectURL';
+// 			}
+// 		}
+// 	});
+// });
+
+// afterAll(() => {
+// 	vi.unstubAllGlobals();
+// });
+
+// test('load - hls', async (t) => {
+// 	vi.doMock('hls.js', () => {
+// 		class Hls {
+// 			static Events = { ERROR: 'ERROR' };
+// 			on() {
+// 				return null;
+// 			}
+// 			loadSource() {
+// 				return null;
+// 			}
+// 			attachMedia() {
+// 				return null;
+// 			}
+// 		}
+
+// 		return { default: Hls };
+// 	});
+
+// 	const Hls = (await import('hls.js')).default;
+
+// 	const url = 'file.m3u8';
+// 	const getSDK = vi.spyOn(utils, 'getSDK').mockImplementation(async () => {
+// 		return Hls;
+// 	});
+// 	const instance = new FilePlayerSvelte({
+// 		target: document.body,
+// 		props: {
+// 			url,
+// 			...TEST_PROPS
+// 		}
+// 	});
+
+// 	const onLoaded = vi.fn();
+// 	instance.$on('loaded', onLoaded);
+// 	instance.load(url);
+// 	t.expect(getSDK).toHaveBeenCalledOnce();
+// 	await expect(
+// 		wait(() => {
+// 			t.expect(onLoaded).toHaveBeenCalledOnce();
+// 		}, 100)
+// 	).resolves.toEqual(undefined);
+// 	getSDK.mockRestore();
+// });
+
+// test('onError - hls', async (t) => {
+// 	vi.doMock('hls.js', () => {
+// 		class Hls {
+// 			static Events = { ERROR: 'ERROR' };
+// 			on(event: string, cb: () => void) {
+// 				if (event === 'ERROR') {
+// 					setTimeout(cb, 100);
+// 				}
+// 			}
+
+// 			loadSource() {
+// 				return null;
+// 			}
+// 			attachMedia() {
+// 				return null;
+// 			}
+// 		}
+
+// 		return { default: Hls };
+// 	});
+
+// 	const Hls = (await import('hls.js')).default;
+
+// 	const getSDK = vi.spyOn(utils, 'getSDK').mockImplementation(async () => {
+// 		return Hls;
+// 	});
+
+// 	const url = 'file.m3u8';
+// 	const instance = new FilePlayerSvelte({
+// 		target: document.body,
+// 		props: {
+// 			url,
+// 			...TEST_PROPS
+// 		}
+// 	});
+
+// 	const onError = vi.fn();
+// 	instance.$on('error', onError);
+// 	instance.load(url);
+// 	t.expect(getSDK).toHaveBeenCalledOnce();
+// 	await expect(
+// 		wait(() => {
+// 			t.expect(onError).toHaveBeenCalledOnce();
+// 		}, 200)
+// 	).resolves.toEqual(undefined);
+// 	getSDK.mockRestore();
+// });
+
+// test('onError - flv', async (t) => {
+// 	vi.doMock('flv.js', () => {
+// 		class FlvPlayer {
+// 			attachMediaElement() {
+// 				// do nothing
+// 			}
+
+// 			on(event: string, cb: (...args: unknown[]) => void) {
+// 				if (event === 'error') {
+// 					setTimeout(() => {
+// 						cb({ error: event });
+// 					}, 100);
+// 				}
+// 			}
+
+// 			load() {
+// 				// do nothing
+// 			}
+// 		}
+
+// 		class FlvJS {
+// 			static Events = { ERROR: 'error' };
+
+// 			loadSource() {
+// 				return null;
+// 			}
+// 			attachMedia() {
+// 				return null;
+// 			}
+// 			static createPlayer() {
+// 				return new FlvPlayer();
+// 			}
+// 		}
+
+// 		return { default: FlvJS };
+// 	});
+
+// 	const flv = (await import('flv.js')).default;
+
+// 	const getSDK = vi.spyOn(utils, 'getSDK').mockImplementation(async () => {
+// 		return flv;
+// 	});
+
+// 	const url = 'file.flv';
+// 	const instance = new FilePlayerSvelte({
+// 		target: document.body,
+// 		props: {
+// 			url,
+// 			...TEST_PROPS
+// 		}
+// 	});
+
+// 	const onError = vi.fn();
+// 	instance.$on('error', onError);
+// 	instance.load(url);
+// 	t.expect(getSDK).toHaveBeenCalledOnce();
+// 	await expect(
+// 		wait(() => {
+// 			t.expect(onError).toHaveBeenCalledOnce();
+// 		}, 200)
+// 	).resolves.toEqual(undefined);
+// 	getSDK.mockRestore();
+// });
+
+// async function mockDashJS(
+// 	additionalCreateMethod?: Partial<
+// 		Omit<MediaPlayerClass, 'on' | 'initialize' | 'getDebug' | 'updateSettings'>
+// 	>
+// ) {
+// 	vi.doMock('dashjs', () => {
+// 		const dashjs = {
+// 			MediaPlayer() {
+// 				return {
+// 					create() {
+// 						return {
+// 							...additionalCreateMethod,
+// 							on() {
+// 								return null;
+// 							},
+// 							initialize() {
+// 								return null;
+// 							},
+// 							getDebug() {
+// 								return {
+// 									setLogToBrowserConsole() {
+// 										return null;
+// 									}
+// 								};
+// 							},
+// 							updateSettings() {
+// 								return null;
+// 							}
+// 						};
+// 					}
+// 				};
+// 			}
+// 		};
+
+// 		return { default: dashjs };
+// 	});
+
+// 	const dashjsSDK = (await import('dashjs')).default;
+// 	const dashjs: DashJS = {
+// 		...dashjsSDK,
+// 		Debug: dashDebug
+// 	};
+
+// 	const getSDK = vi.spyOn(utils, 'getSDK').mockImplementation(async () => {
+// 		return dashjs;
+// 	});
+
+// 	async function assertLoaded(instance: FilePlayerSvelte, url: string) {
+// 		const onLoaded = vi.fn();
+// 		instance.$on('loaded', onLoaded);
+// 		instance.load(url);
+// 		expect(getSDK).toHaveBeenCalledOnce();
+// 		await expect(
+// 			wait(() => {
+// 				expect(onLoaded).toHaveBeenCalledOnce();
+// 			}, 100)
+// 		).resolves.toEqual(undefined);
+// 	}
+
+// 	function cleanUp() {
+// 		getSDK.mockRestore();
+// 	}
+
+// 	return { assertLoaded, cleanUp };
+// }
+
+// test('load - dash', async () => {
+// 	const { assertLoaded, cleanUp } = await mockDashJS();
+// 	const url = 'file.mpd';
+// 	const instance = new FilePlayerSvelte({
+// 		target: document.body,
+// 		props: {
+// 			url,
+// 			...TEST_PROPS
+// 		}
+// 	});
+
+// 	await assertLoaded(instance, url);
+// 	cleanUp();
+// });
+
+// test('stop() - dash', async (t) => {
+// 	const reset = vi.fn();
+// 	const { assertLoaded, cleanUp } = await mockDashJS({
+// 		reset
+// 	});
+// 	const url = 'file.mpd';
+// 	const instance = new FilePlayerSvelte({
+// 		target: document.body,
+// 		props: {
+// 			url,
+// 			...TEST_PROPS
+// 		}
+// 	});
+
+// 	await assertLoaded(instance, url);
+
+// 	instance.stop();
+// 	t.expect(reset).toHaveBeenCalledOnce();
+// 	cleanUp();
+// });
+
+// test('load - MediaStream', async (t) => {
+// 	const url = new window.MediaStream();
+// 	const instance = new FilePlayerSvelte({
+// 		target: document.body,
+// 		props: {
+// 			url,
+// 			...TEST_PROPS
+// 		}
+// 	});
+
+// 	instance.load(url);
+// });
+
+// test('load - Blob URI', (t) => {
+// 	const url = 'blob:http://example.com:ceeed153-91f1-4456-a4a7-cb4085810cc4"';
+// 	const wrapper = render(FilePlayerSvelte, {
+// 		...TEST_PROPS,
+// 		url
+// 	});
+
+// 	const videoElement = [...wrapper.container.querySelectorAll('video')].find((video) => {
+// 		return video.src === url;
+// 	});
+// 	t.expect(videoElement).not.toStrictEqual(undefined);
+// });
+
+// test('forceVideo', (t) => {
+// 	const url = 'file.mp3';
+// 	const wrapper = render(FilePlayerSvelte, {
+// 		...TEST_PROPS,
+// 		url,
+// 		config: {
+// 			...TEST_PROPS.config,
+// 			forceVideo: true
+// 		}
+// 	});
+// 	const videoElement = [...wrapper.container.querySelectorAll('video')].find((video) => {
+// 		return video.src?.includes(url);
+// 	});
+// 	t.expect(videoElement).not.toStrictEqual(undefined);
+// });
+
+// test('forceAudio', (t) => {
+// 	const url = 'file.mp4';
+// 	const wrapper = render(FilePlayerSvelte, {
+// 		...TEST_PROPS,
+// 		url,
+// 		config: {
+// 			...TEST_PROPS.config,
+// 			forceAudio: true
+// 		}
+// 	});
+// 	const audioElement = [...wrapper.container.querySelectorAll('audio')].find((audio) => {
+// 		return audio.src?.includes(url);
+// 	});
+// 	t.expect(audioElement).not.toStrictEqual(undefined);
+// });
+
+// test('render video poster', (t) => {
+// 	const url = 'file.mp3';
+// 	const poster = 'poster.png';
+// 	const wrapper = render(FilePlayerSvelte, {
+// 		...TEST_PROPS,
+// 		url,
+// 		config: {
+// 			...TEST_PROPS.config,
+// 			attributes: { poster } as HTMLVideoAttributes
+// 		}
+// 	});
+
+// 	const videoElement = [...wrapper.container.querySelectorAll('video')].find((video) => {
+// 		return video.src?.includes(url);
+// 	});
+// 	t.expect(videoElement).not.toStrictEqual(undefined);
+// 	t.expect(videoElement?.poster.includes(poster)).toStrictEqual(true);
+// });
+
+// function assertPlayerNotNull(
+// 	player: FileInternalPlayer | null
+// ): asserts player is FilePlayerElement {
+// 	expect(player).not.toStrictEqual(null);
+// }
+
+// test('play()', (t) => {
+// 	const instance = new FilePlayerSvelte({
+// 		target: document.body,
+// 		props: {
+// 			...TEST_PROPS,
+// 			url: 'file.mp4'
+// 		}
+// 	});
+
+// 	const play = vi.fn();
+// 	const player = instance.getPlayer();
+
+// 	assertPlayerNotNull(player);
+// 	const mockPlay = vi.spyOn(player, 'play').mockImplementation(play);
+
+// 	instance.play();
+// 	t.expect(play).toHaveBeenCalled();
+// 	mockPlay.mockRestore();
+// });
+
+// test('play() - promise', (t) => {
+// 	const instance = new FilePlayerSvelte({
+// 		target: document.body,
+// 		props: {
+// 			...TEST_PROPS,
+// 			url: 'file.mp4'
+// 		}
+// 	});
+
+// 	const play = vi.fn().mockImplementation(() => {
+// 		return {
+// 			catch(cb: (...ags: unknown[]) => void) {
+// 				cb();
+// 			}
+// 		};
+// 	});
+// 	const player = instance.getPlayer();
+
+// 	assertPlayerNotNull(player);
+// 	const mockPlay = vi.spyOn(player, 'play').mockImplementation(play);
+
+// 	instance.play();
+// 	t.expect(play).toHaveBeenCalled();
+// 	mockPlay.mockRestore();
+// });
+
+// test('pause()', (t) => {
+// 	const instance = new FilePlayerSvelte({
+// 		target: document.body,
+// 		props: {
+// 			...TEST_PROPS,
+// 			url: 'file.mp4'
+// 		}
+// 	});
+
+// 	const pause = vi.fn();
+// 	const player = instance.getPlayer();
+
+// 	assertPlayerNotNull(player);
+// 	const mockPause = vi.spyOn(player, 'pause').mockImplementation(pause);
+
+// 	instance.pause();
+// 	t.expect(pause).toHaveBeenCalled();
+// 	mockPause.mockRestore();
+// });
+
+// test('stop()', (t) => {
+// 	const instance = new FilePlayerSvelte({
+// 		target: document.body,
+// 		props: {
+// 			...TEST_PROPS,
+// 			url: 'file.mp4'
+// 		}
+// 	});
+
+// 	const stop = vi.fn();
+// 	const player = instance.getPlayer();
+
+// 	assertPlayerNotNull(player);
+// 	const mockStop = vi.spyOn(player, 'removeAttribute').mockImplementation(stop);
+
+// 	instance.stop();
+// 	t.expect(stop).toHaveBeenCalled();
+// 	t.expect(stop).toHaveBeenCalledWith('src');
+// 	mockStop.mockRestore();
+// });
+
+test.skip('foo');
diff --git a/src/test/players/Kaltura.test.ts b/src/test/players/Kaltura.test.ts
index ba2fc1d..6f0ba7a 100644
--- a/src/test/players/Kaltura.test.ts
+++ b/src/test/players/Kaltura.test.ts
@@ -1,9 +1,9 @@
-import type { PlayerJS, PlayerJSPlayer } from '../../lib/players/playerjs.global.types';
+import type { PlayerJS } from '../../lib/players/playerjs.global.types';
 
 import { describe } from 'vitest';
 import testPlayerMethods from '../helpers/testPlayerMethods';
-
 import KalturaSvelte from '../../lib/players/Kaltura.svelte';
+import PlayerJSPlayerMock from './PlayerJSPlayer.mock';
 
 const TEST_URL =
 	'https://cdnapisec.kaltura.com/p/2507381/sp/250738100/embedIframeJs/uiconf_id/44372392/partner_id/2507381?iframeembed=true&playerId=kaltura_player_1605622336&entry_id=1_i1jmzcn3';
@@ -13,69 +13,15 @@ const TEST_PROPS = {
 	url: TEST_URL
 };
 
-class PlajerJSPlayerMock implements PlayerJSPlayer {
-	isReady = false;
-
-	constructor() {
-		// do nothing
-	}
-	getCurrentTime() {
-		// do nothing
-	}
-	getMuted() {
-		// do nothing
-	}
-	getDuration() {
-		return 0;
-	}
-	getPaused() {
-		// do nothing
-	}
-	getVolume() {
-		return 0;
-	}
-	mute() {
-		// do nothing
-	}
-	off() {
-		// do nothing
-	}
-	on() {
-		// do nothing
-	}
-	pause() {
-		// do nothing
-	}
-	play() {
-		// do nothing
-	}
-	setCurrentTime() {
-		// do nothing
-	}
-	setLoop() {
-		// do nothing
-	}
-	setVolume() {
-		// do nothing
-	}
-	supports() {
-		return false;
-	}
-	unmute() {
-		// do nothing
-	}
-}
-
 const PLAYERJS_SDK: PlayerJS = {
-	Player: PlajerJSPlayerMock
+	Player: PlayerJSPlayerMock
 };
 
 describe('testPlayerMethods', () => {
-	testPlayerMethods({
-		Player: KalturaSvelte,
-		playerSDK: PLAYERJS_SDK,
-		loadParameters: [TEST_URL],
-		methods: {
+	testPlayerMethods(
+		KalturaSvelte,
+		new PlayerJSPlayerMock(),
+		{
 			play: 'play',
 			pause: 'pause',
 			stop: null,
@@ -84,6 +30,6 @@ describe('testPlayerMethods', () => {
 			mute: 'mute',
 			unmute: 'unmute'
 		},
-		props: TEST_PROPS
-	});
+		TEST_PROPS
+	);
 });
diff --git a/src/test/players/Mixcloud.test.ts b/src/test/players/Mixcloud.test.ts
index 06434e2..6db5e58 100644
--- a/src/test/players/Mixcloud.test.ts
+++ b/src/test/players/Mixcloud.test.ts
@@ -1,10 +1,10 @@
-import type { MixcloudPlayer, MixcloudWidget } from '../../lib/players/mixcloud.global.types';
+import type { MixcloudPlayer } from '../../lib/players/mixcloud.global.types';
 import type { MixcloudConfig } from '../../lib/players/mixcloud.types';
 
 import { describe } from 'vitest';
 import testPlayerMethods from '../helpers/testPlayerMethods';
-
 import MixcloudSvelte from '../../lib/players/Mixcloud.svelte';
+import MixcloudWidgetMock from './MixcloudPlayer.mock';
 
 const TEST_URL = 'https://www.mixcloud.com/mixcloud/meet-the-curators';
 
@@ -17,88 +17,7 @@ const TEST_PROPS = {
 	config: TEST_CONFIG
 };
 
-class MixcloudWidgetMock implements MixcloudWidget {
-	constructor() {
-		// do nothing
-	}
-	load() {
-		// do nothing
-	}
-	play() {
-		// do nothing
-	}
-	pause() {
-		// do nothing
-	}
-	togglePlay() {
-		// do nothing
-	}
-	async seek() {
-		return false;
-	}
-	async getPosition() {
-		return 0;
-	}
-	async getDuration() {
-		return 0;
-	}
-	async getIsPaused() {
-		return false;
-	}
-	ready = Promise.resolve(null as never);
-	events = {
-		buffering: {
-			on() {
-				// do nothing
-			},
-			off() {
-				// do nothing
-			}
-		},
-		play: {
-			on() {
-				// do nothing
-			},
-			off() {
-				// do nothing
-			}
-		},
-		pause: {
-			on() {
-				// do nothing
-			},
-			off() {
-				// do nothing
-			}
-		},
-		ended: {
-			on() {
-				// do nothing
-			},
-			off() {
-				// do nothing
-			}
-		},
-		progress: {
-			on() {
-				// do nothing
-			},
-			off() {
-				// do nothing
-			}
-		},
-		error: {
-			on() {
-				// do nothing
-			},
-			off() {
-				// do nothing
-			}
-		}
-	};
-}
-
-const PLAYERJS_SDK: MixcloudPlayer = {
+const PLAYER_SDK: MixcloudPlayer = {
 	PlayerWidget() {
 		return new MixcloudWidgetMock();
 	},
@@ -111,11 +30,10 @@ const PLAYERJS_SDK: MixcloudPlayer = {
 };
 
 describe('testPlayerMethods', () => {
-	testPlayerMethods({
-		Player: MixcloudSvelte,
-		playerSDK: PLAYERJS_SDK,
-		loadParameters: [TEST_URL],
-		methods: {
+	testPlayerMethods(
+		MixcloudSvelte,
+		new MixcloudWidgetMock(),
+		{
 			play: 'play',
 			pause: 'pause',
 			stop: null,
@@ -125,6 +43,6 @@ describe('testPlayerMethods', () => {
 			unmute: null,
 			getSecondsLoaded: null
 		},
-		props: TEST_PROPS
-	});
+		TEST_PROPS
+	);
 });
diff --git a/src/test/players/MixcloudPlayer.mock.ts b/src/test/players/MixcloudPlayer.mock.ts
new file mode 100644
index 0000000..eb10f89
--- /dev/null
+++ b/src/test/players/MixcloudPlayer.mock.ts
@@ -0,0 +1,84 @@
+import type { MixcloudWidget } from '../../lib/players/mixcloud.global.types';
+
+class MixcloudWidgetMock implements MixcloudWidget {
+	constructor() {
+		// do nothing
+	}
+	load() {
+		// do nothing
+	}
+	play() {
+		// do nothing
+	}
+	pause() {
+		// do nothing
+	}
+	togglePlay() {
+		// do nothing
+	}
+	async seek() {
+		return false;
+	}
+	async getPosition() {
+		return 0;
+	}
+	async getDuration() {
+		return 0;
+	}
+	async getIsPaused() {
+		return false;
+	}
+	ready = Promise.resolve(null as never);
+	events = {
+		buffering: {
+			on() {
+				// do nothing
+			},
+			off() {
+				// do nothing
+			}
+		},
+		play: {
+			on() {
+				// do nothing
+			},
+			off() {
+				// do nothing
+			}
+		},
+		pause: {
+			on() {
+				// do nothing
+			},
+			off() {
+				// do nothing
+			}
+		},
+		ended: {
+			on() {
+				// do nothing
+			},
+			off() {
+				// do nothing
+			}
+		},
+		progress: {
+			on() {
+				// do nothing
+			},
+			off() {
+				// do nothing
+			}
+		},
+		error: {
+			on() {
+				// do nothing
+			},
+			off() {
+				// do nothing
+			}
+		}
+	};
+}
+
+export default MixcloudWidgetMock;
diff --git a/src/test/players/PlayerJSPlayer.mock.ts b/src/test/players/PlayerJSPlayer.mock.ts
new file mode 100644
index 0000000..662bb76
--- /dev/null
+++ b/src/test/players/PlayerJSPlayer.mock.ts
@@ -0,0 +1,56 @@
+import type { PlayerJSPlayer } from '../../lib/players/playerjs.global.types';
+
+class PlayerJSPlayerMock implements PlayerJSPlayer {
+	isReady = false;
+
+	constructor() {
+		// do nothing
+	}
+	getCurrentTime() {
+		// do nothing
+	}
+	getMuted() {
+		// do nothing
+	}
+	getDuration() {
+		return 0;
+	}
+	getPaused() {
+		// do nothing
+	}
+	getVolume() {
+		return 0;
+	}
+	mute() {
+		// do nothing
+	}
+	off() {
+		// do nothing
+	}
+	on() {
+		// do nothing
+	}
+	pause() {
+		// do nothing
+	}
+	play() {
+		// do nothing
+	}
+	setCurrentTime() {
+		// do nothing
+	}
+	setLoop() {
+		// do nothing
+	}
+	setVolume() {
+		// do nothing
+	}
+	supports() {
+		return false;
+	}
+	unmute() {
+		// do nothing
+	}
+}
+
+export default PlayerJSPlayerMock;
diff --git a/src/test/players/SoundCloud.test.ts b/src/test/players/SoundCloud.test.ts
index 3c80f68..9036da2 100644
--- a/src/test/players/SoundCloud.test.ts
+++ b/src/test/players/SoundCloud.test.ts
@@ -1,14 +1,10 @@
-import type {
-	SoundCloud,
-	SoundCloudPlayer,
-	SoundCloudWidgetEvents
-} from '../../lib/players/soundcloud.global.types';
+import type { SoundCloud, SoundCloudWidgetEvents } from '../../lib/players/soundcloud.global.types';
 import type { SoundCloudConfig } from '../../lib/players/soundcloud.types';
 
 import { describe } from 'vitest';
 import testPlayerMethods from '../helpers/testPlayerMethods';
-
 import SoundCloudSvelte from '../../lib/players/SoundCloud.svelte';
+import SoundCloudPlayerMock from './SoundCloudPlayer.mock';
 
 const TEST_URL = 'https://soundcloud.com/miami-nights-1984/accelerated';
 
@@ -22,66 +18,6 @@ const TEST_PROPS = {
 	config: TEST_CONFIG
 };
 
-class SoundCloudPlayerMock implements SoundCloudPlayer {
-	constructor() {
-		// do nothing
-	}
-	bind() {
-		// do nothing
-	}
-	unbind() {
-		// do nothing
-	}
-	load() {
-		// do nothing
-	}
-	play() {
-		// do nothing
-	}
-	pause() {
-		// do nothing
-	}
-	toggle() {
-		// do nothing
-	}
-	seekTo() {
-		// do nothing
-	}
-	setVolume() {
-		// do nothing
-	}
-	next() {
-		// do nothing
-	}
-	prev() {
-		// do nothing
-	}
-	skip() {
-		// do nothing
-	}
-	getVolume() {
-		return 0;
-	}
-	getDuration() {
-		return 0;
-	}
-	getPosition() {
-		return 0;
-	}
-	getSounds() {
-		return [];
-	}
-	getCurrentSound() {
-		return {};
-	}
-	getCurrentSoundIndex() {
-		return 0;
-	}
-	isPaused() {
-		return false;
-	}
-}
-
 const soundCloudWidgetEvents: SoundCloudWidgetEvents = {
 	LOAD_PROGRESS: 'loadProgress',
 	PLAY_PROGRESS: 'playProgress',
@@ -107,19 +43,13 @@ const PLAYERJS_SDK: SoundCloud = {
 };
 
 describe('testPlayerMethods', () => {
-	testPlayerMethods({
-		Player: SoundCloudSvelte,
-		playerSDK: PLAYERJS_SDK,
-		loadParameters: [TEST_URL, false],
-		methods: {
-			play: 'play',
-			pause: 'pause',
-			stop: null,
-			seekTo: 'seekTo',
-			setVolume: 'setVolume',
-			mute: 'setVolume',
-			unmute: 'setVolume'
-		},
-		props: TEST_PROPS
+	testPlayerMethods(SoundCloudSvelte, new SoundCloudPlayerMock(), {
+		play: 'play',
+		pause: 'pause',
+		stop: null,
+		seekTo: 'seekTo',
+		setVolume: 'setVolume',
+		mute: 'setVolume',
+		unmute: 'setVolume'
 	});
 });
diff --git a/src/test/players/SoundCloudPlayer.mock.ts b/src/test/players/SoundCloudPlayer.mock.ts
new file mode 100644
index 0000000..05e5ffe
--- /dev/null
+++ b/src/test/players/SoundCloudPlayer.mock.ts
@@ -0,0 +1,63 @@
+import type { SoundCloudPlayer } from '../../lib/players/soundcloud.global.types';
+
+class SoundCloudPlayerMock implements SoundCloudPlayer {
+	constructor() {
+		// do nothing
+	}
+	bind() {
+		// do nothing
+	}
+	unbind() {
+		// do nothing
+	}
+	load() {
+		// do nothing
+	}
+	play() {
+		// do nothing
+	}
+	pause() {
+		// do nothing
+	}
+	toggle() {
+		// do nothing
+	}
+	seekTo() {
+		// do nothing
+	}
+	setVolume() {
+		// do nothing
+	}
+	next() {
+		// do nothing
+	}
+	prev() {
+		// do nothing
+	}
+	skip() {
+		// do nothing
+	}
+	getVolume() {
+		return 0;
+	}
+	getDuration() {
+		return 0;
+	}
+	getPosition() {
+		return 0;
+	}
+	getSounds() {
+		return [];
+	}
+	getCurrentSound() {
+		return {};
+	}
+	getCurrentSoundIndex() {
+		return 0;
+	}
+	isPaused() {
+		return false;
+	}
+}
+
+export default SoundCloudPlayerMock;
diff --git a/src/test/players/Streamable.test.ts b/src/test/players/Streamable.test.ts
index 09132d4..454eb1b 100644
--- a/src/test/players/Streamable.test.ts
+++ b/src/test/players/Streamable.test.ts
@@ -1,9 +1,9 @@
-import type { PlayerJS, PlayerJSPlayer } from '../../lib/players/playerjs.global.types';
+import type { PlayerJS } from '../../lib/players/playerjs.global.types';
 
 import { describe } from 'vitest';
 import testPlayerMethods from '../helpers/testPlayerMethods';
-
 import StreamableSvelte from '../../lib/players/Streamable.svelte';
+import PlayerJSPlayerMock from './PlayerJSPlayer.mock';
 
 const TEST_URL = 'https://streamable.com/moo';
 const TEST_PROPS = {
@@ -12,69 +12,15 @@ const TEST_PROPS = {
 	url: TEST_URL
 };
 
-class PlajerJSPlayerMock implements PlayerJSPlayer {
-	isReady = false;
-
-	constructor() {
-		// do nothing
-	}
-	getCurrentTime() {
-		// do nothing
-	}
-	getMuted() {
-		// do nothing
-	}
-	getDuration() {
-		return 0;
-	}
-	getPaused() {
-		// do nothing
-	}
-	getVolume() {
-		return 0;
-	}
-	mute() {
-		// do nothing
-	}
-	off() {
-		// do nothing
-	}
-	on() {
-		// do nothing
-	}
-	pause() {
-		// do nothing
-	}
-	play() {
-		// do nothing
-	}
-	setCurrentTime() {
-		// do nothing
-	}
-	setLoop() {
-		// do nothing
-	}
-	setVolume() {
-		// do nothing
-	}
-	supports() {
-		return false;
-	}
-	unmute() {
-		// do nothing
-	}
-}
-
 const PLAYERJS_SDK: PlayerJS = {
-	Player: PlajerJSPlayerMock
+	Player: PlayerJSPlayerMock
 };
 
 describe('testPlayerMethods', () => {
-	testPlayerMethods({
-		Player: StreamableSvelte,
-		playerSDK: PLAYERJS_SDK,
-		loadParameters: [TEST_URL, false],
-		methods: {
+	testPlayerMethods(
+		StreamableSvelte,
+		new PlayerJSPlayerMock(),
+		{
 			play: 'play',
 			pause: 'pause',
 			stop: null,
@@ -83,6 +29,6 @@ describe('testPlayerMethods', () => {
 			mute: 'mute',
 			unmute: 'unmute'
 		},
-		props: TEST_PROPS
-	});
+		TEST_PROPS
+	);
 });
diff --git a/src/test/players/Twitch.test.ts b/src/test/players/Twitch.test.ts
index 3db589c..b70bcb2 100644
--- a/src/test/players/Twitch.test.ts
+++ b/src/test/players/Twitch.test.ts
@@ -1,14 +1,10 @@
-import type {
-	Twitch,
-	TwitchPlayer,
-	TwitchPlaybackStats
-} from '../../lib/players/twitch.global.types';
+import type { Twitch } from '../../lib/players/twitch.global.types';
 import type { TwitchConfig } from '../../lib/players/twitch.types';
 
 import { describe } from 'vitest';
 import testPlayerMethods from '../helpers/testPlayerMethods';
-
 import TwitchSvelte from '../../lib/players/Twitch.svelte';
+import TwitchPlayerMock from './TwitchPlayerPlayer.mock';
 
 const TEST_URL = 'https://www.twitch.tv/videos/106400740';
 
@@ -25,114 +21,15 @@ const TEST_PROPS = {
 	config: TEST_CONFIG
 };
 
-const twitchPlaybackStats: TwitchPlaybackStats = {
-	backendVersion: '',
-	bufferSize: 0,
-	codecs: '',
-	displayResolution: '',
-	fps: '',
-	hlsLatencyBroadcaster: 0,
-	playbackRate: 0,
-	skippedFrames: 0,
-	videoResolution: ''
-};
-
-class TwitchPlayerMock implements TwitchPlayer {
-	constructor() {
-		// do nothing
-	}
-	disableCaptions() {
-		// do nothing
-	}
-	enableCaptions() {
-		// do nothing
-	}
-	pause() {
-		// do nothing
-	}
-	play() {
-		// do nothing
-	}
-	seek() {
-		// do nothing
-	}
-	setChannel() {
-		// do nothing
-	}
-	setCollection() {
-		// do nothing
-	}
-	setQuality() {
-		// do nothing
-	}
-	setVideo() {
-		// do nothing
-	}
-	getMuted() {
-		return false;
-	}
-	setMuted() {
-		// do nothing
-	}
-	getVolume() {
-		return 0;
-	}
-	setVolume() {
-		// do nothing
-	}
-	getPlaybackStats() {
-		return twitchPlaybackStats;
-	}
-	getChannel() {
-		return '';
-	}
-	getCurrentTime() {
-		return 0;
-	}
-	getDuration() {
-		return 0;
-	}
-	getEnded() {
-		return false;
-	}
-	getQualities() {
-		return [];
-	}
-	getQuality() {
-		return '';
-	}
-	getVideo() {
-		return '';
-	}
-	isPaused() {
-		return false;
-	}
-	addEventListener() {
-		// do nothing
-	}
-
-	static CAPTIONS = 'captions' as const;
-	static ENDED = 'ended' as const;
-	static PAUSE = 'pause' as const;
-	static PLAY = 'play' as const;
-	static PLAYBACK_BLOCKED = 'playbackBlocked' as const;
-	static PLAYING = 'playing' as const;
-	static OFFLINE = 'offline' as const;
-	static ONLINE = 'online' as const;
-	static READY = 'ready' as const;
-	static SEEK = 'seek' as const;
-}
-
 const PLAYERJS_SDK: Twitch = {
 	Player: TwitchPlayerMock
 };
 
 describe('testPlayerMethods', () => {
-	testPlayerMethods({
-		Player: TwitchSvelte,
-		playerSDK: PLAYERJS_SDK,
-		loadParameters: [TEST_URL, false],
-		methods: {
+	testPlayerMethods(
+		TwitchSvelte,
+		new TwitchPlayerMock(),
+		{
 			play: 'play',
 			pause: 'pause',
 			stop: 'pause',
@@ -144,6 +41,6 @@ describe('testPlayerMethods', () => {
 			getCurrentTime: 'getCurrentTime',
 			getSecondsLoaded: null
 		},
-		props: TEST_PROPS
-	});
+		TEST_PROPS
+	);
 });
diff --git a/src/test/players/TwitchPlayerPlayer.mock.ts b/src/test/players/TwitchPlayerPlayer.mock.ts
new file mode 100644
index 0000000..4b8145c
--- /dev/null
+++ b/src/test/players/TwitchPlayerPlayer.mock.ts
@@ -0,0 +1,101 @@
+import type { TwitchPlayer, TwitchPlaybackStats } from '../../lib/players/twitch.global.types';
+
+const twitchPlaybackStats: TwitchPlaybackStats = {
+	backendVersion: '',
+	bufferSize: 0,
+	codecs: '',
+	displayResolution: '',
+	fps: '',
+	hlsLatencyBroadcaster: 0,
+	playbackRate: 0,
+	skippedFrames: 0,
+	videoResolution: ''
+};
+
+class TwitchPlayerMock implements TwitchPlayer {
+	constructor() {
+		// do nothing
+	}
+	disableCaptions() {
+		// do nothing
+	}
+	enableCaptions() {
+		// do nothing
+	}
+	pause() {
+		// do nothing
+	}
+	play() {
+		// do nothing
+	}
+	seek() {
+		// do nothing
+	}
+	setChannel() {
+		// do nothing
+	}
+	setCollection() {
+		// do nothing
+	}
+	setQuality() {
+		// do nothing
+	}
+	setVideo() {
+		// do nothing
+	}
+	getMuted() {
+		return false;
+	}
+	setMuted() {
+		// do nothing
+	}
+	getVolume() {
+		return 0;
+	}
+	setVolume() {
+		// do nothing
+	}
+	getPlaybackStats() {
+		return twitchPlaybackStats;
+	}
+	getChannel() {
+		return '';
+	}
+	getCurrentTime() {
+		return 0;
+	}
+	getDuration() {
+		return 0;
+	}
+	getEnded() {
+		return false;
+	}
+	getQualities() {
+		return [];
+	}
+	getQuality() {
+		return '';
+	}
+	getVideo() {
+		return '';
+	}
+	isPaused() {
+		return false;
+	}
+	addEventListener() {
+		// do nothing
+	}
+
+	static CAPTIONS = 'captions' as const;
+	static ENDED = 'ended' as const;
+	static PAUSE = 'pause' as const;
+	static PLAY = 'play' as const;
+	static PLAYBACK_BLOCKED = 'playbackBlocked' as const;
+	static PLAYING = 'playing' as const;
+	static OFFLINE = 'offline' as const;
+	static ONLINE = 'online' as const;
+	static READY = 'ready' as const;
+	static SEEK = 'seek' as const;
+}
+
+export default TwitchPlayerMock;
diff --git a/src/test/players/Vimeo.test.ts b/src/test/players/Vimeo.test.ts
index 4284b74..3c265cf 100644
--- a/src/test/players/Vimeo.test.ts
+++ b/src/test/players/Vimeo.test.ts
@@ -1,18 +1,10 @@
-import type {
-	Vimeo,
-	VimeoPlayer,
-	VimeoPlayerTextTrack,
-	VimeoPlayerChapter,
-	VimeoPlayerOptions,
-	VimeoEmbedOptions,
-	VimeoPlayerSetAutopauseParams
-} from '../../lib/players/vimeo.global.types';
+import type { Vimeo } from '../../lib/players/vimeo.global.types';
 import type { ViemoConfig } from '../../lib/players/vimeo.types';
 
 import { describe } from 'vitest';
 import testPlayerMethods from '../helpers/testPlayerMethods';
-
 import VimeoSvelte from '../../lib/players/Vimeo.svelte';
+import VimeoPlayerMock from './VimeoPlayer.mock';
 
 const TEST_URL = 'https://vimeo.com/90509568';
 
@@ -30,163 +22,21 @@ const TEST_PROPS = {
 	config: TEST_CONFIG
 };
 
-const vimeoPlayerTextTrack: VimeoPlayerTextTrack = {
-	kind: '',
-	label: '',
-	language: '',
-	mode: ''
-};
-
-const vimeoPlayerChapter: VimeoPlayerChapter = {
-	index: 0,
-	startTime: 0,
-	title: ''
-};
-
-class VimeoPlayerMock implements VimeoPlayer {
-	constructor() {
-		// do nothing
-	}
-	async getAutopause() {
-		return false;
-	}
-	async getCurrentTime() {
-		return 0;
-	}
-	async getDuration() {
-		return 0;
-	}
-	async getEnded() {
-		return false;
-	}
-	async getLoop() {
-		return false;
-	}
-	async getPaused() {
-		return false;
-	}
-	async getPlaybackRate() {
-		return 0;
-	}
-	async getVolume() {
-		return 0;
-	}
-	async pause() {
-		// do nothing
-	}
-	async play() {
-		// do nothing
-	}
-	setAutopause<T extends VimeoEmbedOptions['autopause']>(params: VimeoPlayerSetAutopauseParams<T>) {
-		return params.autopause;
-	}
-	async setCurrentTime<T extends number>(seconds: T) {
-		return seconds;
-	}
-	async setLoop<T extends VimeoEmbedOptions['loop']>(loop: T) {
-		return loop;
-	}
-	async setPlaybackRate<T extends number>(playbackRate: T) {
-		return playbackRate;
-	}
-	async setVolume<T extends number>(volume: T) {
-		return volume;
-	}
-	async getChapters() {
-		return [];
-	}
-	async getCurrentChapter() {
-		return vimeoPlayerChapter;
-	}
-	async addCuePoint() {
-		return '';
-	}
-	async getCuePoints() {
-		return [];
-	}
-	async removeCuePoint<T extends string>(id: T) {
-		return id;
-	}
-	async disableTextTrack() {
-		// do nothing
-	}
-	async enableTextTrack() {
-		return vimeoPlayerTextTrack;
-	}
-	async getTextTracks() {
-		return [];
-	}
-	async destroy() {
-		// do nothing
-	}
-	async getColor() {
-		return '';
-	}
-	async getColors() {
-		return [];
-	}
-	async getVideoEmbedCode() {
-		return '';
-	}
-	async getVideoHeight() {
-		return 0;
-	}
-	async getVideoId() {
-		return 0;
-	}
-	async getVideoTitle() {
-		return '';
-	}
-	async getVideoUrl() {
-		return '';
-	}
-	async getVideoWidth() {
-		return 0;
-	}
-	async ready() {
-		// do nothing
-	}
-	setColor<T extends VimeoPlayerOptions['color']>(color: T) {
-		return color;
-	}
-	setColors<T extends VimeoPlayerOptions['colors']>(colors: T) {
-		return colors;
-	}
-	unload() {
-		// do nothing
-	}
-	async loadVideo() {
-		return 0;
-	}
-	on() {
-		// do nothing
-	}
-	off() {
-		// do nothing
-	}
-}
-
 const PLAYERJS_SDK: Vimeo = {
 	Player: VimeoPlayerMock
 };
 
 describe('testPlayerMethods', () => {
-	testPlayerMethods({
-		Player: VimeoSvelte,
-		playerSDK: PLAYERJS_SDK,
-		loadParameters: [TEST_URL],
-		methods: {
-			play: 'play',
-			pause: 'pause',
-			stop: 'unload',
-			seekTo: 'setCurrentTime',
-			setVolume: 'setVolume',
-			mute: 'setVolume',
-			unmute: 'setVolume',
-			getDuration: null,
-			getCurrentTime: null,
-			getSecondsLoaded: null
-		},
-		props: TEST_PROPS
+	testPlayerMethods(VimeoSvelte, new VimeoPlayerMock(), {
+		play: 'play',
+		pause: 'pause',
+		stop: 'unload',
+		seekTo: 'setCurrentTime',
+		setVolume: 'setVolume',
+		mute: 'setVolume',
+		unmute: 'setVolume',
+		getDuration: null,
+		getCurrentTime: null,
+		getSecondsLoaded: null
 	});
 });
diff --git a/src/test/players/VimeoPlayer.mock.ts b/src/test/players/VimeoPlayer.mock.ts
new file mode 100644
index 0000000..d1b72cc
--- /dev/null
+++ b/src/test/players/VimeoPlayer.mock.ts
@@ -0,0 +1,146 @@
+import type {
+	VimeoPlayer,
+	VimeoPlayerTextTrack,
+	VimeoPlayerChapter,
+	VimeoPlayerOptions,
+	VimeoEmbedOptions,
+	VimeoPlayerSetAutopauseParams
+} from '../../lib/players/vimeo.global.types';
+
+const vimeoPlayerTextTrack: VimeoPlayerTextTrack = {
+	kind: '',
+	label: '',
+	language: '',
+	mode: ''
+};
+
+const vimeoPlayerChapter: VimeoPlayerChapter = {
+	index: 0,
+	startTime: 0,
+	title: ''
+};
+
+class VimeoPlayerMock implements VimeoPlayer {
+	constructor() {
+		// do nothing
+	}
+	async getAutopause() {
+		return false;
+	}
+	async getCurrentTime() {
+		return 0;
+	}
+	async getDuration() {
+		return 0;
+	}
+	async getEnded() {
+		return false;
+	}
+	async getLoop() {
+		return false;
+	}
+	async getPaused() {
+		return false;
+	}
+	async getPlaybackRate() {
+		return 0;
+	}
+	async getVolume() {
+		return 0;
+	}
+	async pause() {
+		// do nothing
+	}
+	async play() {
+		// do nothing
+	}
+	setAutopause<T extends VimeoEmbedOptions['autopause']>(params: VimeoPlayerSetAutopauseParams<T>) {
+		return params.autopause;
+	}
+	async setCurrentTime<T extends number>(seconds: T) {
+		return seconds;
+	}
+	async setLoop<T extends VimeoEmbedOptions['loop']>(loop: T) {
+		return loop;
+	}
+	async setPlaybackRate<T extends number>(playbackRate: T) {
+		return playbackRate;
+	}
+	async setVolume<T extends number>(volume: T) {
+		return volume;
+	}
+	async getChapters() {
+		return [];
+	}
+	async getCurrentChapter() {
+		return vimeoPlayerChapter;
+	}
+	async addCuePoint() {
+		return '';
+	}
+	async getCuePoints() {
+		return [];
+	}
+	async removeCuePoint<T extends string>(id: T) {
+		return id;
+	}
+	async disableTextTrack() {
+		// do nothing
+	}
+	async enableTextTrack() {
+		return vimeoPlayerTextTrack;
+	}
+	async getTextTracks() {
+		return [];
+	}
+	async destroy() {
+		// do nothing
+	}
+	async getColor() {
+		return '';
+	}
+	async getColors() {
+		return [];
+	}
+	async getVideoEmbedCode() {
+		return '';
+	}
+	async getVideoHeight() {
+		return 0;
+	}
+	async getVideoId() {
+		return 0;
+	}
+	async getVideoTitle() {
+		return '';
+	}
+	async getVideoUrl() {
+		return '';
+	}
+	async getVideoWidth() {
+		return 0;
+	}
+	async ready() {
+		// do nothing
+	}
+	setColor<T extends VimeoPlayerOptions['color']>(color: T) {
+		return color;
+	}
+	setColors<T extends VimeoPlayerOptions['colors']>(colors: T) {
+		return colors;
+	}
+	unload() {
+		// do nothing
+	}
+	async loadVideo() {
+		return 0;
+	}
+	on() {
+		// do nothing
+	}
+	off() {
+		// do nothing
+	}
+}
+
+export default VimeoPlayerMock;
diff --git a/src/test/players/Wistia.test.ts b/src/test/players/Wistia.test.ts
index 096b3e3..b1fb3cc 100644
--- a/src/test/players/Wistia.test.ts
+++ b/src/test/players/Wistia.test.ts
@@ -3,8 +3,8 @@ import type { WistiaConfig } from '../../lib/players/wistia.types';
 
 import { describe } from 'vitest';
 import testPlayerMethods from '../helpers/testPlayerMethods';
-
 import WistiaSvelte from '../../lib/players/Wistia.svelte';
+import WistiaPlayerMock from './WistiaPlayer.mock';
 
 const TEST_URL = 'https://home.wistia.com/medias/e4a27b971d';
 
@@ -28,12 +28,11 @@ const PLAYERJS_SDK: Wistia = {
 	}
 };
 
-describe.skip('testPlayerMethods', () => {
-	testPlayerMethods({
-		Player: WistiaSvelte,
-		playerSDK: PLAYERJS_SDK,
-		loadParameters: [TEST_URL],
-		methods: {
+describe('testPlayerMethods', () => {
+	testPlayerMethods(
+		WistiaSvelte,
+		new WistiaPlayerMock(),
+		{
 			play: 'play',
 			pause: 'pause',
 			// stop: 'remove',
@@ -46,6 +45,6 @@ describe.skip('testPlayerMethods', () => {
 			getSecondsLoaded: null,
 			setPlaybackRate: 'playbackRate'
 		},
-		props: TEST_PROPS
-	});
+		TEST_PROPS
+	);
 });
diff --git a/src/test/players/WistiaPlayer.mock.ts b/src/test/players/WistiaPlayer.mock.ts
new file mode 100644
index 0000000..6100f40
--- /dev/null
+++ b/src/test/players/WistiaPlayer.mock.ts
@@ -0,0 +1,149 @@
+import type {
+	WistiaPlayer,
+	WistiaHeightOption,
+	WistiaLookOption,
+	WistiaLOOKCHANGEEventCallbackData,
+	WistiaPlayerState,
+	WistiaQualityOption
+} from '../../lib/players/wistia.global.types';
+
+class WistiaPlayerMock implements WistiaPlayer {
+	constructor() {
+		// do nothing
+	}
+
+	addToPlaylist() {
+		// do nothing
+	}
+	aspect() {
+		return 0;
+	}
+	bind() {
+		// do nothing
+	}
+	cancelFullscreen() {
+		// do nothing
+	}
+	duration() {
+		return 0;
+	}
+	email(): string;
+	email(_: string): void;
+	email(_?: string): string | void {
+		// do nothing
+	}
+	embedded() {
+		return false;
+	}
+	eventKey() {
+		return '';
+	}
+	getSubtitlesScale() {
+		return 0;
+	}
+	hasData() {
+		return false;
+	}
+	hashedId() {
+		return '';
+	}
+	height(): number;
+	height(height: number, options?: Partial<WistiaHeightOption>): void;
+	height(_?: number, __?: Partial<WistiaHeightOption>): number | void {
+		// do nothing
+	}
+	inFullscreen() {
+		return false;
+	}
+	isMuted() {
+		return false;
+	}
+	look(): WistiaLOOKCHANGEEventCallbackData;
+	look(options: Partial<WistiaLookOption>): void;
+	look(_?: Partial<WistiaLookOption>): WistiaLOOKCHANGEEventCallbackData | void {
+		// do nothing
+	}
+	mute() {
+		// do nothing
+	}
+	name() {
+		return '';
+	}
+	pause() {
+		// do nothing
+	}
+	percentWatched() {
+		return 0;
+	}
+	play() {
+		// do nothing
+	}
+	playbackRate() {
+		// do nothing
+	}
+	ready() {
+		return false;
+	}
+	remove() {
+		// do nothing
+	}
+	replaceWith() {
+		// do nothing
+	}
+	requestFullscreen() {
+		// do nothing
+	}
+	secondsWatched() {
+		return 0;
+	}
+	secondsWatchedVector() {
+		return [];
+	}
+	setSubtitlesScale(scale: number) {
+		// do nothing
+	}
+	state(): WistiaPlayerState {
+		return 'beforeplay';
+	}
+	time(): number;
+	time(seconds: number): void;
+	time(_?: number): number | void {
+		// do nothing
+	}
+	unbind() {
+		// do nothing
+	}
+	unmute() {
+		// do nothing
+	}
+	videoHeight(): number;
+	videoHeight(pixels: number, options?: Partial<WistiaHeightOption>): void;
+	videoHeight(_?: number, __?: Partial<WistiaHeightOption>): number | void {
+		// do nothing
+	}
+	videoQuality(): WistiaQualityOption;
+	videoQuality(quality: WistiaQualityOption): void;
+	videoQuality(_?: WistiaQualityOption): WistiaQualityOption | void {
+		// do nothing
+	}
+	videoWidth(): number;
+	videoWidth(pixels: number, options?: Partial<WistiaHeightOption>): void;
+	videoWidth(_?: number, __?: Partial<WistiaHeightOption>): number | void {
+		// do nothing
+	}
+	visitorKey() {
+		return '';
+	}
+	volume(): number;
+	volume(volume: number): void;
+	volume(_?: number): number | void {
+		// do nothing
+	}
+	width(): number;
+	width(pixels: number): void;
+	width(_?: number): number | void {
+		// do nothing
+	}
+}
+
+export default WistiaPlayerMock;
diff --git a/src/test/players/YouTube.test.ts b/src/test/players/YouTube.test.ts
index 9c0cc75..b89fac5 100644
--- a/src/test/players/YouTube.test.ts
+++ b/src/test/players/YouTube.test.ts
@@ -1,25 +1,21 @@
-import type {
-	YTPlayerState,
-	YT,
-	YTPlayer,
-	YTPlaybackRate,
-	YTPlayerStateValue
-} from '../../lib/players/youtube.global.types';
+import type { YTPlayerState, YT } from '../../lib/players/youtube.global.types';
 import type { YouTubeConfig } from '../../lib/players/youtube.types';
 
-import { test, describe, beforeAll, afterAll, vi, expect } from 'vitest';
+import { test, describe, beforeAll, afterAll, vi } from 'vitest';
 import { render } from '@testing-library/svelte';
 
 import * as utils from '../../lib/players/utils';
 import YouTubeSvelte from '../../lib/players/YouTube.svelte';
 import testPlayerMethods from '../helpers/testPlayerMethods';
+import YouTubePlayerMock from './YouTubePlayer.mock';
 
-const TEST_URL = 'https://www.youtube.com/watch?v=oUFJJNQGwhk';
-const TEST_CONFIG: YouTubeConfig = {
+const TEST_URL_ID = 'oUFJJNQGwhk';
+const TEST_URL = `https://www.youtube.com/watch?v=${TEST_URL_ID}`;
+const TEST_CONFIG = {
 	playerVars: {},
 	embedOptions: {},
 	onUnstarted: utils.noop
-};
+} satisfies YouTubeConfig;
 
 const TEST_PROPS = {
 	controls: false,
@@ -29,142 +25,14 @@ const TEST_PROPS = {
 	config: TEST_CONFIG
 };
 
-const PLAYER_STATE: YTPlayerState = {
+const PLAYER_STATE = {
 	UNSTARTED: -1,
 	ENDED: 0,
 	PLAYING: 1,
 	PAUSED: 2,
 	BUFFERING: 3,
 	CUED: 5
-};
-
-class YouTubePlayerMock implements YTPlayer {
-	constructor() {
-		// do nothiing
-	}
-
-	cueVideoById() {
-		// do nothing
-	}
-
-	loadVideoById() {
-		// do nothing
-	}
-
-	cueVideoByUrl() {
-		// do nothing
-	}
-
-	loadVideoByUrl() {
-		// do nothing
-	}
-
-	cuePlaylist() {
-		// do nothing
-	}
-
-	loadPlaylist() {
-		// do nothing
-	}
-
-	playVideo() {
-		// do nothing
-	}
-	pauseVideo() {
-		// do nothing
-	}
-	stopVideo() {
-		// do nothing
-	}
-	seekTo() {
-		// do nothing
-	}
-	getSphericalProperties() {
-		return {};
-	}
-
-	setSphericalProperties() {
-		// do nothing
-	}
-	nextVideo() {
-		// do nothing
-	}
-	previousVideo() {
-		// do nothing
-	}
-	playVideoAt() {
-		// do nothing
-	}
-	mute() {
-		// do nothing
-	}
-	unMute() {
-		// do nothing
-	}
-	isMuted() {
-		return false;
-	}
-	setVolume() {
-		// do nothing
-	}
-	getVolume() {
-		return 0;
-	}
-	setSize() {
-		return {};
-	}
-	getPlaybackRate(): YTPlaybackRate {
-		return 1;
-	}
-	setPlaybackRate() {
-		// do nothing
-	}
-	getAvailablePlaybackRates(): YTPlaybackRate[] {
-		return [1];
-	}
-	setLoop() {
-		// do nothing
-	}
-	setShuffle() {
-		// do nothing
-	}
-	getVideoLoadedFraction() {
-		return 0;
-	}
-	getPlayerState(): YTPlayerStateValue {
-		return 0;
-	}
-	getCurrentTime() {
-		return 0;
-	}
-	getDuration() {
-		return 0;
-	}
-	getVideoUrl() {
-		return '';
-	}
-	getVideoEmbedCode() {
-		return '';
-	}
-	getPlaylist() {
-		return [''];
-	}
-	getPlaylistIndex() {
-		return 0;
-	}
-	addEventListener() {
-		// do nothing
-	}
-	removeEventListener() {
-		// do nothing
-	}
-	getIframe() {
-		return document.createElement('iframe');
-	}
-	destroy() {
-		// do nothing
-	}
-}
+} satisfies YTPlayerState;
 
 const YOUTUBE_SDK: YT = {
 	loaded: 1,
@@ -178,59 +46,88 @@ const YOUTUBE_SDK: YT = {
 	unsubscribe: utils.noop
 };
 
-describe('testPlayerMethods', () => {
-	beforeAll(() => {
-		vi.stubGlobal('location', {
-			...window.location,
-			origin: 'mock-origin'
-		});
+beforeAll(() => {
+	vi.stubGlobal('location', {
+		...window.location,
+		origin: 'mock-origin'
+	});
 
-		vi.stubGlobal('YT', {
-			PlayerState: PLAYER_STATE
-		});
+	vi.stubGlobal('YT', {
+		PlayerState: PLAYER_STATE
+	});
+});
 
+afterAll(() => {
+	vi.unstubAllGlobals();
+});
+
+describe('testPlayerMethods', () => {
+	beforeAll(() => {
 		vi.spyOn(document.body, 'contains').mockImplementation(() => true);
 	});
 
 	afterAll(() => {
-		vi.unstubAllGlobals();
+		vi.resetAllMocks();
 	});
 
-	testPlayerMethods({
-		Player: YouTubeSvelte,
-		playerSDK: YOUTUBE_SDK,
-		loadParameters: [TEST_URL, false],
-		methods: {
-			play: 'playVideo',
-			pause: 'pauseVideo',
-			stop: 'stopVideo',
-			seekTo: 'seekTo',
-			setVolume: 'setVolume',
-			mute: 'mute',
-			unmute: 'unMute',
-			getDuration: 'getDuration',
-			getCurrentTime: 'getCurrentTime',
-			getSecondsLoaded: 'getVideoLoadedFraction',
-			setPlaybackRate: 'setPlaybackRate'
-		}
+	testPlayerMethods(YouTubeSvelte, new YouTubePlayerMock(), {
+		play: 'playVideo',
+		pause: 'pauseVideo',
+		stop: 'stopVideo',
+		seekTo: 'seekTo',
+		setVolume: 'setVolume',
+		mute: 'mute',
+		unmute: 'unMute',
+		getDuration: 'getDuration',
+		getCurrentTime: 'getCurrentTime',
+		getSecondsLoaded: 'getVideoLoadedFraction',
+		setPlaybackRate: 'setPlaybackRate'
 	});
 });
 
-test('load()', (t) => {
+test('load()', async (t) => {
+	t.expect.assertions(3);
+	vi.doMock('./YouTubePlayer.mock', () => {
+		const Player = vi.fn((container, options) => {
+			t.expect(container.tagName).toStrictEqual('DIV');
+			setTimeout(options.events.onReady, 100);
+		});
+
+		return { default: Player };
+	});
+
+	const Player = (await import('./YouTubePlayer.mock')).default;
 	const getSDK = vi.spyOn(utils, 'getSDK').mockImplementation(async () => {
-		return YOUTUBE_SDK;
+		return { ...YOUTUBE_SDK, Player };
 	});
 
-	const instance = new YouTubeSvelte({
-		target: document.body,
-		props: TEST_PROPS
+	return new Promise((resolve) => {
+		const onReady = vi.fn(() => {
+			t.expect(true).toBeTruthy();
+			resolve(undefined);
+		});
+
+		const instance = new YouTubeSvelte({
+			target: document.body,
+			props: TEST_PROPS
+		});
+		instance.$on('ready', onReady);
+		instance.load(TEST_URL);
+		t.expect(getSDK).toHaveBeenCalledOnce();
+		getSDK.mockRestore();
 	});
-	instance.load(TEST_URL);
-	t.expect(getSDK).toHaveBeenCalledOnce();
-	getSDK.mockRestore();
 });
 
-test('load() when ready', (t) => {
+test('load() when ready', async (t) => {
+	const cueVideoById = vi.fn();
+	vi.doMock('./YouTubePlayer.mock', () => {
+		const Player = vi.fn();
+		Player.prototype.cueVideoById = cueVideoById;
+
+		return { default: Player };
+	});
+
+	const Player = (await import('./YouTubePlayer.mock')).default;
 	const getSDK = vi.spyOn(utils, 'getSDK').mockImplementation(async () => {
 		return YOUTUBE_SDK;
 	});
@@ -239,84 +136,79 @@ test('load() when ready', (t) => {
 		target: document.body,
 		props: TEST_PROPS
 	});
+	instance.setPlayer(new Player());
 	instance.load(TEST_URL, true);
-	t.expect(getSDK).not.toHaveBeenCalledOnce();
+	t.expect(cueVideoById).toHaveBeenCalledWith({
+		videoId: TEST_URL_ID,
+		startSeconds: undefined,
+		endSeconds: undefined
+	});
+	t.expect(getSDK).not.toHaveBeenCalled();
 	getSDK.mockRestore();
 });
 
-describe('onStateChange()', () => {
-	beforeAll(() => {
-		vi.stubGlobal('YT', {
-			PlayerState: PLAYER_STATE
-		});
-	});
-
-	afterAll(() => {
-		vi.unstubAllGlobals();
-	});
-
-	test('onStateChange() - play', (t) => {
-		let calledPlay = false;
-		const onPlay = () => {
-			calledPlay = true;
-		};
-		let calledBufferEnd = false;
-		const onBufferEnd = () => {
-			calledBufferEnd = true;
-		};
-		const instance = new YouTubeSvelte({
-			target: document.body,
-			props: TEST_PROPS
-		});
-		instance.$on('play', onPlay);
-		instance.$on('bufferEnd', onBufferEnd);
-		instance.onStateChange({ data: PLAYER_STATE.PLAYING, target: expect.anything() });
-		t.expect(calledPlay && calledBufferEnd).toStrictEqual(true);
+test('onStateChange() - play', (t) => {
+	let calledPlay = false;
+	let calledBufferEnd = false;
+	function onPlay() {
+		calledPlay = true;
+	}
+	function onBufferEnd() {
+		calledBufferEnd = true;
+	}
+	const instance = new YouTubeSvelte({
+		target: document.body,
+		props: TEST_PROPS
 	});
+	instance.$on('play', onPlay);
+	instance.$on('bufferEnd', onBufferEnd);
+	instance.onStateChange({ data: PLAYER_STATE.PLAYING, target: t.expect.anything() });
+	t.expect(calledPlay && calledBufferEnd).toStrictEqual(true);
+});
 
-	test('onStateChange() - pause', async (t) => {
-		const onPause = vi.fn();
-		const instance = new YouTubeSvelte({
-			target: document.body,
-			props: TEST_PROPS
-		});
-		instance.$on('pause', onPause);
-		instance.onStateChange({ data: PLAYER_STATE.PAUSED, target: expect.anything() });
-		t.expect(onPause).toBeCalled();
+test('onStateChange() - pause', async (t) => {
+	const onPause = vi.fn();
+	const instance = new YouTubeSvelte({
+		target: document.body,
+		props: TEST_PROPS
 	});
+	instance.$on('pause', onPause);
+	instance.onStateChange({ data: PLAYER_STATE.PAUSED, target: t.expect.anything() });
+	t.expect(onPause).toBeCalled();
+});
 
-	test('onStateChange() - buffer', async (t) => {
-		const onBuffer = vi.fn();
-		const instance = new YouTubeSvelte({
-			target: document.body,
-			props: TEST_PROPS
-		});
-		instance.$on('buffer', onBuffer);
-		instance.onStateChange({ data: PLAYER_STATE.BUFFERING, target: expect.anything() });
-		t.expect(onBuffer).toBeCalled();
+test('onStateChange() - buffer', async (t) => {
+	const onBuffer = vi.fn();
+	const instance = new YouTubeSvelte({
+		target: document.body,
+		props: TEST_PROPS
 	});
+	instance.$on('buffer', onBuffer);
+	instance.onStateChange({ data: PLAYER_STATE.BUFFERING, target: t.expect.anything() });
+	t.expect(onBuffer).toBeCalled();
+});
 
-	test('onStateChange() - ended', async (t) => {
-		const onEnded = vi.fn();
-		const instance = new YouTubeSvelte({
-			target: document.body,
-			props: TEST_PROPS
-		});
-		instance.$on('ended', onEnded);
-		instance.onStateChange({ data: PLAYER_STATE.ENDED, target: expect.anything() });
-		t.expect(onEnded).toBeCalled();
+test('onStateChange() - ended', async (t) => {
+	const onEnded = vi.fn();
+	const instance = new YouTubeSvelte({
+		target: document.body,
+		props: TEST_PROPS
 	});
+	instance.setPlayer(new YouTubePlayerMock());
+	instance.$on('ended', onEnded);
+	instance.onStateChange({ data: PLAYER_STATE.ENDED, target: t.expect.anything() });
+	t.expect(onEnded).toBeCalled();
+});
 
-	test('onStateChange() - ready', async (t) => {
-		const onReady = vi.fn();
-		const instance = new YouTubeSvelte({
-			target: document.body,
-			props: TEST_PROPS
-		});
-		instance.$on('ready', onReady);
-		instance.onStateChange({ data: PLAYER_STATE.CUED, target: expect.anything() });
-		t.expect(onReady).toBeCalled();
+test('onStateChange() - ready', async (t) => {
+	const onReady = vi.fn();
+	const instance = new YouTubeSvelte({
+		target: document.body,
+		props: TEST_PROPS
 	});
+	instance.$on('ready', onReady);
+	instance.onStateChange({ data: PLAYER_STATE.CUED, target: t.expect.anything() });
+	t.expect(onReady).toBeCalled();
 });
 
 test('render()', (t) => {
diff --git a/src/test/players/YouTubePlayer.mock.ts b/src/test/players/YouTubePlayer.mock.ts
new file mode 100644
index 0000000..d2a1b6f
--- /dev/null
+++ b/src/test/players/YouTubePlayer.mock.ts
@@ -0,0 +1,135 @@
+import type {
+	YTPlayer,
+	YTPlaybackRate,
+	YTPlayerStateValue
+} from '../../lib/players/youtube.global.types';
+
+class YouTubePlayerMock implements YTPlayer {
+	constructor() {
+		// do nothiing
+	}
+
+	cueVideoById() {
+		// do nothing
+	}
+
+	loadVideoById() {
+		// do nothing
+	}
+
+	cueVideoByUrl() {
+		// do nothing
+	}
+
+	loadVideoByUrl() {
+		// do nothing
+	}
+
+	cuePlaylist() {
+		// do nothing
+	}
+
+	loadPlaylist() {
+		// do nothing
+	}
+
+	playVideo() {
+		// do nothing
+	}
+	pauseVideo() {
+		// do nothing
+	}
+	stopVideo() {
+		// do nothing
+	}
+	seekTo() {
+		// do nothing
+	}
+	getSphericalProperties() {
+		return {};
+	}
+
+	setSphericalProperties() {
+		// do nothing
+	}
+	nextVideo() {
+		// do nothing
+	}
+	previousVideo() {
+		// do nothing
+	}
+	playVideoAt() {
+		// do nothing
+	}
+	mute() {
+		// do nothing
+	}
+	unMute() {
+		// do nothing
+	}
+	isMuted() {
+		return false;
+	}
+	setVolume() {
+		// do nothing
+	}
+	getVolume() {
+		return 0;
+	}
+	setSize() {
+		return {};
+	}
+	getPlaybackRate(): YTPlaybackRate {
+		return 1;
+	}
+	setPlaybackRate() {
+		// do nothing
+	}
+	getAvailablePlaybackRates(): YTPlaybackRate[] {
+		return [1];
+	}
+	setLoop() {
+		// do nothing
+	}
+	setShuffle() {
+		// do nothing
+	}
+	getVideoLoadedFraction() {
+		return 0;
+	}
+	getPlayerState(): YTPlayerStateValue {
+		return 0;
+	}
+	getCurrentTime() {
+		return 0;
+	}
+	getDuration() {
+		return 0;
+	}
+	getVideoUrl() {
+		return '';
+	}
+	getVideoEmbedCode() {
+		return '';
+	}
+	getPlaylist() {
+		return [''];
+	}
+	getPlaylistIndex() {
+		return 0;
+	}
+	addEventListener() {
+		// do nothing
+	}
+	removeEventListener() {
+		// do nothing
+	}
+	getIframe() {
+		return document.createElement('iframe');
+	}
+	destroy() {
+		// do nothing
+	}
+}
+
+export default YouTubePlayerMock;
diff --git a/src/test/utils/getSDK.test.ts b/src/test/utils/getSDK.test.ts
index 72c8934..85a2add 100644
--- a/src/test/utils/getSDK.test.ts
+++ b/src/test/utils/getSDK.test.ts
@@ -5,6 +5,7 @@ const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
 beforeEach(() => {
 	vi.unstubAllGlobals();
+	vi.restoreAllMocks();
 });
 
 test('loads script', async (t) => {
@@ -14,13 +15,13 @@ test('loads script', async (t) => {
 		cb();
 	});
 
-	const sdk = await getSDK({
-		url: 'http://example.com/abc.js',
-		sdkGlobal: 'YT',
-		sdkReady: undefined,
-		isLoaded: undefined,
-		fetchScript: loadScriptOverride
-	});
+	const sdk = await getSDK(
+		'http://example.com/abc.js',
+		'YT',
+		undefined,
+		undefined,
+		loadScriptOverride
+	);
 	t.expect(sdk).toStrictEqual('sdk');
 	t.expect(loadScriptOverride).toHaveBeenCalledOnce();
 });
@@ -31,15 +32,7 @@ test('throws on error', async (t) => {
 		cb(new Error('Load error'));
 	});
 	await t
-		.expect(
-			getSDK({
-				url: 'http://example.com/throws.js',
-				sdkGlobal: 'YT',
-				sdkReady: undefined,
-				isLoaded: undefined,
-				fetchScript: loadScriptOverride
-			})
-		)
+		.expect(getSDK('http://example.com/throws.js', 'YT', undefined, undefined, loadScriptOverride))
 		.rejects.toThrow();
 	t.expect(loadScriptOverride).toHaveBeenCalledOnce();
 });
@@ -47,13 +40,13 @@ test('throws on error', async (t) => {
 test('does not fetch again when loaded', async (t) => {
 	const loadScriptOverride = vi.fn();
 	vi.stubGlobal('YT', 'sdk');
-	const sdk = await getSDK({
-		url: 'http://example.com/def.js',
-		sdkGlobal: 'YT',
-		sdkReady: undefined,
-		isLoaded: undefined,
-		fetchScript: loadScriptOverride
-	});
+	const sdk = await getSDK(
+		'http://example.com/def.js',
+		'YT',
+		undefined,
+		undefined,
+		loadScriptOverride
+	);
 	t.expect(sdk).toStrictEqual('sdk');
 	t.expect(loadScriptOverride).not.toHaveBeenCalled();
 });
@@ -65,20 +58,8 @@ test('does not fetch again when loading', async (t) => {
 		cb();
 	});
 	const result = await Promise.all([
-		getSDK({
-			url: 'http://example.com/ghi.js',
-			sdkGlobal: 'YT',
-			sdkReady: undefined,
-			isLoaded: undefined,
-			fetchScript: loadScriptOverride
-		}),
-		getSDK({
-			url: 'http://example.com/ghi.js',
-			sdkGlobal: 'YT',
-			sdkReady: undefined,
-			isLoaded: undefined,
-			fetchScript: loadScriptOverride
-		})
+		getSDK('http://example.com/ghi.js', 'YT', undefined, undefined, loadScriptOverride),
+		getSDK('http://example.com/ghi.js', 'YT', undefined, undefined, loadScriptOverride)
 	]);
 	t.expect(result[0]).toStrictEqual('sdk');
 	t.expect(result[1]).toStrictEqual('sdk');
@@ -97,22 +78,16 @@ test('does fetch again after fetch error', async (t) => {
 	});
 	await t
 		.expect(
-			getSDK({
-				url: 'http://example.com/pqr.js',
-				sdkGlobal: 'YT',
-				sdkReady: undefined,
-				isLoaded: undefined,
-				fetchScript: loadScriptOverrideError
-			})
+			getSDK('http://example.com/pqr.js', 'YT', undefined, undefined, loadScriptOverrideError)
 		)
 		.rejects.toThrow();
-	const sdk = await getSDK({
-		url: 'http://example.com/pqr.js',
-		sdkGlobal: 'YT',
-		sdkReady: undefined,
-		isLoaded: undefined,
-		fetchScript: loadScriptOverride
-	});
+	const sdk = await getSDK(
+		'http://example.com/pqr.js',
+		'YT',
+		undefined,
+		undefined,
+		loadScriptOverride
+	);
 	t.expect(sdk).toStrictEqual('sdk');
 	t.expect(loadScriptOverrideError).toHaveBeenCalledOnce();
 	t.expect(loadScriptOverride).toHaveBeenCalledOnce();
@@ -125,13 +100,13 @@ test('waits for sdkReady callback', async (t) => {
 		vi.stubGlobal('YT', 'sdk');
 		window.onYouTubeIframeAPIReady(); // This doesn't work for some reason?
 	});
-	const sdk = await getSDK({
-		url: 'http://example.com/jkl.js',
-		sdkGlobal: 'YT',
-		sdkReady: 'onYouTubeIframeAPIReady',
-		isLoaded: undefined,
-		fetchScript: loadScriptOverride
-	});
+	const sdk = await getSDK(
+		'http://example.com/jkl.js',
+		'YT',
+		'onYouTubeIframeAPIReady',
+		undefined,
+		loadScriptOverride
+	);
 	t.expect(sdk).toStrictEqual('sdk');
 	t.expect(loadScriptOverride).toHaveBeenCalledOnce();
 });
@@ -144,20 +119,20 @@ test('multiple sdkReady callbacks', async (t) => {
 		window.onYouTubeIframeAPIReady();
 	});
 	const result = await Promise.all([
-		getSDK({
-			url: 'http://example.com/mno.js',
-			sdkGlobal: 'YT',
-			sdkReady: 'onYouTubeIframeAPIReady',
-			isLoaded: undefined,
-			fetchScript: loadScriptOverride
-		}),
-		getSDK({
-			url: 'http://example.com/mno.js',
-			sdkGlobal: 'YT',
-			sdkReady: 'onYouTubeIframeAPIReady',
-			isLoaded: undefined,
-			fetchScript: loadScriptOverride
-		})
+		getSDK(
+			'http://example.com/mno.js',
+			'YT',
+			'onYouTubeIframeAPIReady',
+			undefined,
+			loadScriptOverride
+		),
+		getSDK(
+			'http://example.com/mno.js',
+			'YT',
+			'onYouTubeIframeAPIReady',
+			undefined,
+			loadScriptOverride
+		)
 	]);
 	t.expect(result[0]).toStrictEqual('sdk');
 	t.expect(result[1]).toStrictEqual('sdk');