diff --git a/packages/qwik/src/core/client/diffJsx-utils.ts b/packages/qwik/src/core/client/diffJsx-utils.ts
new file mode 100644
index 00000000000..8c2f2dee9b2
--- /dev/null
+++ b/packages/qwik/src/core/client/diffJsx-utils.ts
@@ -0,0 +1,41 @@
+import type { JSXNode } from '@builder.io/qwik';
+import { Fragment, Slot } from '@builder.io/qwik';
+
+export function tagToString(tag: any): string {
+  return tag === Fragment ? 'Fragment' : tag === Slot ? 'Slot' : String(tag);
+}
+
+export function attrsEqual(expectedValue: any, receivedValue: any) {
+  const isEqual =
+    typeof expectedValue == 'boolean'
+      ? expectedValue
+        ? receivedValue !== null
+        : receivedValue === null || receivedValue === 'false'
+      : expectedValue == receivedValue;
+  // console.log('attrsEqual', expectedValue, receivedValue, isEqual);
+  return isEqual;
+}
+
+export function getJSXChildren(jsx: JSXNode): JSXNode[] {
+  const children = jsx.children;
+  if (Array.isArray(children)) {
+    return children as any;
+  } else if (children != null) {
+    return [children] as any;
+  }
+  return [];
+}
+
+export function jsxToHTML(jsx: JSXNode, pad: string = ''): string {
+  const html: string[] = [];
+  if (jsx.type) {
+    html.push(pad, '<', tagToString(jsx.type), '>\n');
+    getJSXChildren(jsx).forEach((jsx) => {
+      html.push(jsxToHTML(jsx, pad + '  '));
+    });
+    html.push(pad, '</', tagToString(jsx.type), '>\n');
+  } else {
+    html.push(pad, JSON.stringify(jsx), '\n');
+  }
+  return html.join('');
+}
diff --git a/packages/qwik/src/core/client/diffJsxVNode.ts b/packages/qwik/src/core/client/diffJsxVNode.ts
new file mode 100644
index 00000000000..9a8a9ad9aef
--- /dev/null
+++ b/packages/qwik/src/core/client/diffJsxVNode.ts
@@ -0,0 +1,172 @@
+import type { JSXNode, _ElementVNode, _TextVNode, _VNode } from '@builder.io/qwik';
+import { Fragment } from '@builder.io/qwik';
+import {
+  vnode_getAttr,
+  vnode_getAttrKeys,
+  vnode_getElementName,
+  vnode_getFirstChild,
+  vnode_getNextSibling,
+  vnode_getNode,
+  vnode_getText,
+  vnode_isElementVNode,
+  vnode_isTextVNode,
+  vnode_isVirtualVNode,
+} from './vnode';
+import { serializeBooleanOrNumberAttribute } from '../shared/utils/styles';
+import { isHtmlAttributeAnEventName, isJsxPropertyAnEventName } from '../shared/utils/event-names';
+import { Q_PROPS_SEPARATOR } from '../shared/utils/markers';
+import { attrsEqual, getJSXChildren, jsxToHTML, tagToString } from './diffJsx-utils';
+
+export function getVNodeChildren(vNode: _VNode): _VNode[] {
+  const children: _VNode[] = [];
+  let child = vnode_getFirstChild(vNode);
+  while (child) {
+    if (!shouldSkip(child)) {
+      children.push(child);
+    }
+    child = vnode_getNextSibling(child);
+  }
+  return children;
+}
+
+export function diffJsxVNode(
+  received: _VNode,
+  expected: JSXNode | string,
+  path: string[] = []
+): string[] {
+  if (!received) {
+    return [path.join(' > ') + ' missing'];
+  }
+  const diffs: string[] = [];
+  if (typeof expected === 'string') {
+    const receivedText = vnode_isTextVNode(received) ? vnode_getText(received as _TextVNode) : null;
+    if (expected !== receivedText) {
+      diffs.push(path.join(' > '));
+      diffs.push('EXPECTED', JSON.stringify(expected));
+      diffs.push('RECEIVED:', JSON.stringify(receivedText));
+    }
+  } else {
+    path.push(tagToString(expected.type));
+    const receivedTag = vnode_isElementVNode(received)
+      ? vnode_getElementName(received as _ElementVNode)
+      : vnode_isVirtualVNode(received)
+        ? Fragment
+        : undefined;
+    const isTagSame = String(expected.type).toLowerCase() == String(receivedTag).toLowerCase();
+    if (!isTagSame) {
+      diffs.push(path.join(' > ') + ' expecting=' + expected.type + ' received=' + receivedTag);
+    }
+    const allProps: string[] = [];
+    expected.varProps && propsAdd(allProps, Object.keys(expected.varProps));
+    expected.constProps && propsAdd(allProps, Object.keys(expected.constProps));
+    const receivedElement = vnode_isElementVNode(received)
+      ? (vnode_getNode(received) as Element)
+      : null;
+    propsAdd(allProps, vnode_isElementVNode(received) ? vnode_getAttrKeys(received).sort() : []);
+    receivedElement && propsAdd(allProps, constPropsFromElement(receivedElement));
+    allProps.sort();
+    allProps.forEach((prop) => {
+      if (isJsxPropertyAnEventName(prop) || isHtmlAttributeAnEventName(prop)) {
+        return;
+      }
+      // we need this, because Domino lowercases all attributes for `element.attributes`
+      const propLowerCased = prop.toLowerCase();
+      let receivedValue =
+        vnode_getAttr(received, prop) ||
+        vnode_getAttr(received, propLowerCased) ||
+        receivedElement?.getAttribute(prop) ||
+        receivedElement?.getAttribute(propLowerCased);
+      let expectedValue =
+        prop === 'key' || prop === 'q:key' ? (expected.key ?? receivedValue) : expected.props[prop];
+      if (typeof receivedValue === 'boolean' || typeof receivedValue === 'number') {
+        receivedValue = serializeBooleanOrNumberAttribute(receivedValue);
+      }
+      if (typeof expectedValue === 'number') {
+        expectedValue = serializeBooleanOrNumberAttribute(expectedValue);
+      }
+      if (!attrsEqual(expectedValue, receivedValue)) {
+        diffs.push(`${path.join(' > ')}: [${prop}]`);
+        diffs.push('  EXPECTED: ' + JSON.stringify(expectedValue));
+        diffs.push('  RECEIVED: ' + JSON.stringify(receivedValue));
+      }
+    });
+    const receivedChildren = getVNodeChildren(received);
+    const expectedChildren = getJSXChildren(expected);
+    if (receivedChildren.length === expectedChildren.length) {
+      for (let i = 0; i < receivedChildren.length; i++) {
+        const receivedChild = receivedChildren[i];
+        const expectedChild = expectedChildren[i];
+        diffs.push(...diffJsxVNode(receivedChild, expectedChild, path));
+      }
+    } else {
+      diffs.push(
+        `${path.join(' > ')} expecting ${expectedChildren.length} children but was ${receivedChildren.length}`
+      );
+      diffs.push('EXPECTED', jsxToHTML(expected, '  '));
+      diffs.push('RECEIVED:', vnodeToHTML(received, '  '));
+    }
+    path.pop();
+  }
+  return diffs;
+}
+
+function vnodeToHTML(vNode: _VNode | null, pad: string = ''): string {
+  const html: string[] = [];
+  while (vNode) {
+    html.push(
+      pad +
+        vNode
+          .toString()
+          .split('\n')
+          .join('\n' + pad)
+    );
+    while (shouldSkip((vNode = vnode_getNextSibling(vNode!)))) {
+      // skip
+    }
+  }
+  return html.join('');
+}
+
+function propsAdd(existing: string[], incoming: string[]) {
+  for (const prop of incoming) {
+    if (prop !== 'children') {
+      let found = false;
+      for (let i = 0; i < existing.length; i++) {
+        if (existing[i].toLowerCase() === prop.toLowerCase()) {
+          found = true;
+          break;
+        }
+      }
+      if (!found) {
+        existing.push(prop);
+      }
+    }
+  }
+}
+
+function constPropsFromElement(element: Element) {
+  const props: string[] = [];
+  for (let i = 0; i < element.attributes.length; i++) {
+    const attr = element.attributes[i];
+    if (attr.name !== '' && attr.name !== Q_PROPS_SEPARATOR) {
+      props.push(attr.name);
+    }
+  }
+  props.sort();
+  return props;
+}
+
+function shouldSkip(vNode: _VNode | null) {
+  if (vNode && vnode_isElementVNode(vNode)) {
+    const tag = vnode_getElementName(vNode);
+    if (
+      tag === 'script' &&
+      (vnode_getAttr(vNode, 'type') === 'qwik/vnode' ||
+        vnode_getAttr(vNode, 'type') === 'x-qwik/vnode' ||
+        vnode_getAttr(vNode, 'type') === 'qwik/state')
+    ) {
+      return true;
+    }
+  }
+  return false;
+}
diff --git a/packages/qwik/src/core/client/dom-container.ts b/packages/qwik/src/core/client/dom-container.ts
index d4e02f37e0d..a7617443f92 100644
--- a/packages/qwik/src/core/client/dom-container.ts
+++ b/packages/qwik/src/core/client/dom-container.ts
@@ -53,8 +53,6 @@ import {
 } from './types';
 import {
   VNodeJournalOpCode,
-  mapArray_get,
-  mapArray_set,
   vnode_applyJournal,
   vnode_getDOMChildNodes,
   vnode_getDomParent,
@@ -69,6 +67,7 @@ import {
   vnode_setProp,
   type VNodeJournal,
 } from './vnode';
+import { mapArray_get, mapArray_set } from './mapArray';
 import { vnode_diff } from './vnode-diff';
 
 /** @public */
diff --git a/packages/qwik/src/core/client/mapArray.ts b/packages/qwik/src/core/client/mapArray.ts
new file mode 100644
index 00000000000..9fb36c5ad31
--- /dev/null
+++ b/packages/qwik/src/core/client/mapArray.ts
@@ -0,0 +1,70 @@
+import { assertTrue } from '../shared/error/assert';
+
+export const mapApp_findIndx = <T>(
+  elementVNode: (T | null)[],
+  key: string,
+  start: number
+): number => {
+  assertTrue(start % 2 === 0, 'Expecting even number.');
+  let bottom = (start as number) >> 1;
+  let top = (elementVNode.length - 2) >> 1;
+  while (bottom <= top) {
+    const mid = bottom + ((top - bottom) >> 1);
+    const midKey = elementVNode[mid << 1] as string;
+    if (midKey === key) {
+      return mid << 1;
+    }
+    if (midKey < key) {
+      bottom = mid + 1;
+    } else {
+      top = mid - 1;
+    }
+  }
+  return (bottom << 1) ^ -1;
+};
+
+export const mapArray_set = <T>(
+  elementVNode: (T | null)[],
+  key: string,
+  value: T | null,
+  start: number
+) => {
+  const indx = mapApp_findIndx(elementVNode, key, start);
+  if (indx >= 0) {
+    if (value == null) {
+      elementVNode.splice(indx, 2);
+    } else {
+      elementVNode[indx + 1] = value;
+    }
+  } else if (value != null) {
+    elementVNode.splice(indx ^ -1, 0, key as any, value);
+  }
+};
+
+export const mapApp_remove = <T>(
+  elementVNode: (T | null)[],
+  key: string,
+  start: number
+): T | null => {
+  const indx = mapApp_findIndx(elementVNode, key, start);
+  let value: T | null = null;
+  if (indx >= 0) {
+    value = elementVNode[indx + 1];
+    elementVNode.splice(indx, 2);
+    return value;
+  }
+  return value;
+};
+
+export const mapArray_get = <T>(
+  elementVNode: (T | null)[],
+  key: string,
+  start: number
+): T | null => {
+  const indx = mapApp_findIndx(elementVNode, key, start);
+  if (indx >= 0) {
+    return elementVNode[indx + 1] as T | null;
+  } else {
+    return null;
+  }
+};
diff --git a/packages/qwik/src/core/client/vnode-diff.ts b/packages/qwik/src/core/client/vnode-diff.ts
index 9bff54f7229..3a6b9832aef 100644
--- a/packages/qwik/src/core/client/vnode-diff.ts
+++ b/packages/qwik/src/core/client/vnode-diff.ts
@@ -58,8 +58,6 @@ import {
   type VirtualVNode,
 } from './types';
 import {
-  mapApp_findIndx,
-  mapArray_set,
   vnode_ensureElementInflated,
   vnode_getAttr,
   vnode_getDomParentVNode,
@@ -90,6 +88,8 @@ import {
   vnode_walkVNode,
   type VNodeJournal,
 } from './vnode';
+import { mapApp_findIndx } from './mapArray';
+import { mapArray_set } from './mapArray';
 import { getNewElementNamespaceData } from './vnode-namespace';
 import { WrappedSignal, EffectProperty, isSignal, EffectData } from '../signal/signal';
 import type { Signal } from '../signal/signal.public';
diff --git a/packages/qwik/src/core/client/vnode.ts b/packages/qwik/src/core/client/vnode.ts
index 7685410aa25..160f68db3a8 100644
--- a/packages/qwik/src/core/client/vnode.ts
+++ b/packages/qwik/src/core/client/vnode.ts
@@ -169,6 +169,7 @@ import {
   vnode_getElementNamespaceFlags,
 } from './vnode-namespace';
 import { escapeHTML } from '../shared/utils/character-escaping';
+import { mapArray_set, mapArray_get, mapApp_findIndx } from './mapArray';
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -938,77 +939,6 @@ export const vnode_applyJournal = (journal: VNodeJournal) => {
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
-export const mapApp_findIndx = <T>(
-  elementVNode: (T | null)[],
-  key: string,
-  start: number
-): number => {
-  assertTrue(start % 2 === 0, 'Expecting even number.');
-  let bottom = (start as number) >> 1;
-  let top = (elementVNode.length - 2) >> 1;
-  while (bottom <= top) {
-    const mid = bottom + ((top - bottom) >> 1);
-    const midKey = elementVNode[mid << 1] as string;
-    if (midKey === key) {
-      return mid << 1;
-    }
-    if (midKey < key) {
-      bottom = mid + 1;
-    } else {
-      top = mid - 1;
-    }
-  }
-  return (bottom << 1) ^ -1;
-};
-
-export const mapArray_set = <T>(
-  elementVNode: (T | null)[],
-  key: string,
-  value: T | null,
-  start: number
-) => {
-  const indx = mapApp_findIndx(elementVNode, key, start);
-  if (indx >= 0) {
-    if (value == null) {
-      elementVNode.splice(indx, 2);
-    } else {
-      elementVNode[indx + 1] = value;
-    }
-  } else if (value != null) {
-    elementVNode.splice(indx ^ -1, 0, key as any, value);
-  }
-};
-
-export const mapApp_remove = <T>(
-  elementVNode: (T | null)[],
-  key: string,
-  start: number
-): T | null => {
-  const indx = mapApp_findIndx(elementVNode, key, start);
-  let value: T | null = null;
-  if (indx >= 0) {
-    value = elementVNode[indx + 1];
-    elementVNode.splice(indx, 2);
-    return value;
-  }
-  return value;
-};
-
-export const mapArray_get = <T>(
-  elementVNode: (T | null)[],
-  key: string,
-  start: number
-): T | null => {
-  const indx = mapApp_findIndx(elementVNode, key, start);
-  if (indx >= 0) {
-    return elementVNode[indx + 1] as T | null;
-  } else {
-    return null;
-  }
-};
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export const vnode_insertBefore = (
   journal: VNodeJournal,
   parent: ElementVNode | VirtualVNode,
diff --git a/packages/qwik/src/core/shared/component-execution.ts b/packages/qwik/src/core/shared/component-execution.ts
index e803ba50de6..068e1f730c0 100644
--- a/packages/qwik/src/core/shared/component-execution.ts
+++ b/packages/qwik/src/core/shared/component-execution.ts
@@ -1,7 +1,7 @@
 import { isDev } from '@builder.io/qwik/build';
 import { isQwikComponent, type OnRenderFn } from './component.public';
 import { assertDefined } from './error/assert';
-import { isQrl, type QRLInternal } from './qrl/qrl-class';
+import type { QRLInternal } from './qrl/qrl-class';
 import { JSXNodeImpl, isJSXNode, type Props } from './jsx/jsx-runtime';
 import type { JSXNode, JSXOutput } from './jsx/types/jsx-node';
 import type { KnownEventNames } from './jsx/types/jsx-qwik-events';
@@ -23,6 +23,7 @@ import { logWarn } from './utils/log';
 import { EffectProperty, isSignal } from '../signal/signal';
 import { vnode_isVNode } from '../client/vnode';
 import { clearVNodeEffectDependencies } from '../signal/signal-subscriber';
+import { isQrl } from './qrl/qrl-utils';
 
 /**
  * Use `executeComponent` to execute a component.
diff --git a/packages/qwik/src/core/shared/platform/platform.ts b/packages/qwik/src/core/shared/platform/platform.ts
index e3767cad8d8..677a02d6e97 100644
--- a/packages/qwik/src/core/shared/platform/platform.ts
+++ b/packages/qwik/src/core/shared/platform/platform.ts
@@ -1,6 +1,6 @@
 import { isServer } from '@builder.io/qwik/build';
 import { qError, QError_qrlMissingChunk, QError_qrlMissingContainer } from '../error/error';
-import { getSymbolHash } from '../qrl/qrl-class';
+import { getSymbolHash } from '../qrl/qrl-utils';
 import { qDynamicPlatform } from '../utils/qdev';
 import type { CorePlatform } from './types';
 
diff --git a/packages/qwik/src/core/shared/qrl/qrl-class.ts b/packages/qwik/src/core/shared/qrl/qrl-class.ts
index b748a902609..42583740603 100644
--- a/packages/qwik/src/core/shared/qrl/qrl-class.ts
+++ b/packages/qwik/src/core/shared/qrl/qrl-class.ts
@@ -15,17 +15,9 @@ import { getQFuncs, QInstanceAttr } from '../utils/markers';
 import { isPromise, maybeThen } from '../utils/promises';
 import { qDev, qSerialize, qTest, seal } from '../utils/qdev';
 import { isArray, isFunction, type ValueOrPromise } from '../utils/types';
-import { isSignal } from '../../signal/signal';
 import type { QRLDev } from './qrl';
 import type { QRL, QrlArgs, QrlReturn } from './qrl.public';
-import type { Signal } from '../../signal/signal.public';
-
-export const isQrl = <T = unknown>(value: unknown): value is QRLInternal<T> => {
-  return typeof value === 'function' && typeof (value as any).getSymbol === 'function';
-};
-
-// Make sure this value is same as value in `platform.ts`
-export const SYNC_QRL = '<sync>';
+import { getSymbolHash, SYNC_QRL } from './qrl-utils';
 
 interface SyncQRLSymbol {
   $symbol$: typeof SYNC_QRL;
@@ -33,11 +25,6 @@ interface SyncQRLSymbol {
 
 export type SyncQRLInternal = QRLInternal & SyncQRLSymbol;
 
-/** Sync QRL is a function which is serialized into `<script q:func="qwik/json">` tag. */
-export const isSyncQrl = (value: any): value is SyncQRLInternal => {
-  return isQrl(value) && value.$symbol$ == SYNC_QRL;
-};
-
 export type QRLInternalMethods<TYPE> = {
   readonly $chunk$: string | null;
   readonly $symbol$: string;
@@ -239,30 +226,6 @@ export const createQRL = <TYPE>(
   return qrl;
 };
 
-export const getSymbolHash = (symbolName: string) => {
-  const index = symbolName.lastIndexOf('_');
-  if (index > -1) {
-    return symbolName.slice(index + 1);
-  }
-  return symbolName;
-};
-
-export function assertQrl<T>(qrl: QRL<T>): asserts qrl is QRLInternal<T> {
-  if (qDev) {
-    if (!isQrl(qrl)) {
-      throw new Error('Not a QRL');
-    }
-  }
-}
-
-export function assertSignal<T>(obj: unknown): asserts obj is Signal<T> {
-  if (qDev) {
-    if (!isSignal(obj) && !isSignal(obj)) {
-      throw new Error('Not a Signal');
-    }
-  }
-}
-
 const EMITTED = /*#__PURE__*/ new Set();
 
 export const emitUsedSymbol = (symbol: string, element: Element | undefined, reqTime: number) => {
diff --git a/packages/qwik/src/core/shared/qrl/qrl-utils.ts b/packages/qwik/src/core/shared/qrl/qrl-utils.ts
new file mode 100644
index 00000000000..f641544501f
--- /dev/null
+++ b/packages/qwik/src/core/shared/qrl/qrl-utils.ts
@@ -0,0 +1,32 @@
+/** QRL related utilities that you can import without importing all of Qwik. */
+
+import { isDev } from '@builder.io/qwik/build';
+import type { QRLInternal, SyncQRLInternal } from './qrl-class';
+import type { QRL } from './qrl.public';
+
+export const SYNC_QRL = '<sync>';
+
+/** Sync QRL is a function which is serialized into `<script q:func="qwik/json">` tag. */
+export const isSyncQrl = (value: any): value is SyncQRLInternal => {
+  return isQrl(value) && value.$symbol$ == SYNC_QRL;
+};
+
+export const isQrl = <T = unknown>(value: unknown): value is QRLInternal<T> => {
+  return typeof value === 'function' && typeof (value as any).getSymbol === 'function';
+};
+
+export function assertQrl<T>(qrl: QRL<T>): asserts qrl is QRLInternal<T> {
+  if (isDev) {
+    if (!isQrl(qrl)) {
+      throw new Error('Not a QRL');
+    }
+  }
+}
+
+export const getSymbolHash = (symbolName: string) => {
+  const index = symbolName.lastIndexOf('_');
+  if (index > -1) {
+    return symbolName.slice(index + 1);
+  }
+  return symbolName;
+};
diff --git a/packages/qwik/src/core/shared/qrl/qrl.public.ts b/packages/qwik/src/core/shared/qrl/qrl.public.ts
index 0fb429e21cd..7bcedc52e1e 100644
--- a/packages/qwik/src/core/shared/qrl/qrl.public.ts
+++ b/packages/qwik/src/core/shared/qrl/qrl.public.ts
@@ -1,6 +1,7 @@
 import { qDev, qRuntimeQrl } from '../utils/qdev';
 import type { QRLDev } from './qrl';
-import { SYNC_QRL, createQRL } from './qrl-class';
+import { createQRL } from './qrl-class';
+import { SYNC_QRL } from './qrl-utils';
 
 // We use `unknown` instead of `never` when it's not a function so we allow assigning QRL<function> to QRL<any>
 export type QrlArgs<T> = T extends (...args: infer ARGS) => any ? ARGS : unknown[];
diff --git a/packages/qwik/src/core/shared/qrl/qrl.ts b/packages/qwik/src/core/shared/qrl/qrl.ts
index 3bd15cb3894..28e0397d3eb 100644
--- a/packages/qwik/src/core/shared/qrl/qrl.ts
+++ b/packages/qwik/src/core/shared/qrl/qrl.ts
@@ -2,7 +2,7 @@ import { QError_dynamicImportFailed, QError_unknownTypeArgument, qError } from '
 import { EMPTY_ARRAY } from '../utils/flyweight';
 import { qSerialize } from '../utils/qdev';
 import { isFunction, isString } from '../utils/types';
-import { createQRL, emitEvent, getSymbolHash, type QRLInternal } from './qrl-class';
+import { createQRL, emitEvent, type QRLInternal } from './qrl-class';
 import type { QRL } from './qrl.public';
 
 // https://regexr.com/68v72
@@ -79,7 +79,7 @@ export const qrl = <T = any>(
     // Emit event
     announcedQRL.add(symbol);
     emitEvent('qprefetch', {
-      symbols: [getSymbolHash(symbol)],
+      symbols: [symbol],
       bundles: chunk && [chunk],
     });
   }
diff --git a/packages/qwik/src/core/shared/shared-serialization.ts b/packages/qwik/src/core/shared/shared-serialization.ts
index cdf2a64b6f0..f7dfa648273 100644
--- a/packages/qwik/src/core/shared/shared-serialization.ts
+++ b/packages/qwik/src/core/shared/shared-serialization.ts
@@ -34,13 +34,8 @@ import {
 } from './jsx/jsx-runtime';
 import { Slot } from './jsx/slot.public';
 import { getPlatform } from './platform/platform';
-import {
-  createQRL,
-  isQrl,
-  isSyncQrl,
-  type QRLInternal,
-  type SyncQRLInternal,
-} from './qrl/qrl-class';
+import { createQRL, type QRLInternal, type SyncQRLInternal } from './qrl/qrl-class';
+import { isQrl, isSyncQrl } from './qrl/qrl-utils';
 import type { QRL } from './qrl/qrl.public';
 import { ChoreType } from './scheduler';
 import type { DeserializeContainer, HostElement, ObjToProxyMap } from './types';
diff --git a/packages/qwik/src/core/shared/shared-serialization.unit.ts b/packages/qwik/src/core/shared/shared-serialization.unit.ts
index f9217a80bb1..ebc609147b8 100644
--- a/packages/qwik/src/core/shared/shared-serialization.unit.ts
+++ b/packages/qwik/src/core/shared/shared-serialization.unit.ts
@@ -7,7 +7,7 @@ import { StoreFlags, createStore } from '../signal/store';
 import { createResourceReturn } from '../use/use-resource';
 import { Task } from '../use/use-task';
 import { inlinedQrl } from './qrl/qrl';
-import { createQRL, isQrl, type QRLInternal } from './qrl/qrl-class';
+import { createQRL, type QRLInternal } from './qrl/qrl-class';
 import {
   TypeIds,
   _constants,
@@ -17,6 +17,7 @@ import {
   dumpState,
 } from './shared-serialization';
 import { EMPTY_ARRAY, EMPTY_OBJ } from './utils/flyweight';
+import { isQrl } from './qrl/qrl-utils';
 
 const DEBUG = false;
 
diff --git a/packages/qwik/src/core/shared/utils/scoped-styles.ts b/packages/qwik/src/core/shared/utils/scoped-styles.ts
index 37a3d60cd33..2aede98ba44 100644
--- a/packages/qwik/src/core/shared/utils/scoped-styles.ts
+++ b/packages/qwik/src/core/shared/utils/scoped-styles.ts
@@ -1,5 +1,9 @@
 import type { Props } from '../jsx/jsx-runtime';
-import { styleContent } from './styles';
+import { ComponentStylesPrefixContent } from './markers';
+
+export const styleContent = (styleId: string): string => {
+  return ComponentStylesPrefixContent + styleId;
+};
 
 export function hasClassAttr(props: Props): boolean {
   for (const key in props) {
diff --git a/packages/qwik/src/core/shared/utils/styles.ts b/packages/qwik/src/core/shared/utils/styles.ts
index f5df16c491d..5566dceed96 100644
--- a/packages/qwik/src/core/shared/utils/styles.ts
+++ b/packages/qwik/src/core/shared/utils/styles.ts
@@ -4,10 +4,9 @@ import { isPreventDefault } from './event-names';
 import { isClassAttr } from './scoped-styles';
 import { isArray, isString } from './types';
 import { isUnitlessNumber } from './unitless_number';
-import { assertQrl } from '../qrl/qrl-class';
+import { assertQrl } from '../qrl/qrl-utils';
 import type { QRL } from '../qrl/qrl.public';
 import { hashCode } from './hash_code';
-import { ComponentStylesPrefixContent } from './markers';
 
 export const serializeClass = (obj: ClassList): string => {
   if (!obj) {
@@ -73,7 +72,11 @@ export const serializeBooleanOrNumberAttribute = (value: any) => {
   return value != null ? String(value) : null;
 };
 
-export function serializeAttribute(key: string, value: any, styleScopedId?: string | null): string {
+export function serializeAttribute(
+  key: string,
+  value: unknown,
+  styleScopedId?: string | null
+): string | null {
   if (isClassAttr(key)) {
     const serializedClass = serializeClass(value as ClassList);
     value = styleScopedId
@@ -89,7 +92,7 @@ export function serializeAttribute(key: string, value: any, styleScopedId?: stri
   } else if (value === true && isPreventDefault(key)) {
     value = '';
   }
-  return value;
+  return value as string | null;
 }
 
 function isEnumeratedBooleanAttribute(key: string) {
@@ -111,7 +114,3 @@ export const styleKey = (qStyles: QRL<string>, index: number): string => {
   assertQrl(qStyles);
   return `${hashCode(qStyles.$hash$)}-${index}`;
 };
-
-export const styleContent = (styleId: string): string => {
-  return ComponentStylesPrefixContent + styleId;
-};
diff --git a/packages/qwik/src/core/ssr/ssr-render-jsx.ts b/packages/qwik/src/core/ssr/ssr-render-jsx.ts
index 6d25bbf1b33..a29e681ebef 100644
--- a/packages/qwik/src/core/ssr/ssr-render-jsx.ts
+++ b/packages/qwik/src/core/ssr/ssr-render-jsx.ts
@@ -5,7 +5,7 @@ import { Slot } from '../shared/jsx/slot.public';
 import type { JSXNode, JSXOutput } from '../shared/jsx/types/jsx-node';
 import type { JSXChildren } from '../shared/jsx/types/jsx-qwik-attributes';
 import { SSRComment, SSRRaw, SSRStream, type SSRStreamChildren } from '../shared/jsx/utils.public';
-import { isQrl } from '../shared/qrl/qrl-class';
+import { isQrl } from '../shared/qrl/qrl-utils';
 import type { QRL } from '../shared/qrl/qrl.public';
 import { qrlToString, type SerializationContext } from '../shared/shared-serialization';
 import { DEBUG_TYPE, VirtualType } from '../shared/types';
diff --git a/packages/qwik/src/core/ssr/ssr-types.ts b/packages/qwik/src/core/ssr/ssr-types.ts
index 4b5551a3b63..e21ff5c0903 100644
--- a/packages/qwik/src/core/ssr/ssr-types.ts
+++ b/packages/qwik/src/core/ssr/ssr-types.ts
@@ -14,7 +14,7 @@ import type { ResourceReturnInternal } from '../use/use-resource';
 import type { Signal } from '../signal/signal.public';
 
 export type SsrAttrKey = string;
-export type SsrAttrValue = string | Signal<any> | boolean | Object | null;
+export type SsrAttrValue = string | Signal<any> | boolean | object | null;
 export type SsrAttrs = Array<SsrAttrKey | SsrAttrValue>;
 
 /** @internal */
diff --git a/packages/qwik/src/core/tests/component.spec.tsx b/packages/qwik/src/core/tests/component.spec.tsx
index ddda6f6004d..d979dc5ae44 100644
--- a/packages/qwik/src/core/tests/component.spec.tsx
+++ b/packages/qwik/src/core/tests/component.spec.tsx
@@ -26,7 +26,7 @@ import { ErrorProvider } from '../../testing/rendering.unit-util';
 import { HTML_NS, MATH_NS, SVG_NS } from '../shared/utils/markers';
 import { delay } from '../shared/utils/promises';
 
-const debug = false; //true;
+const debug = !false; //true;
 Error.stackTraceLimit = 100;
 
 function Hola(props: any) {
@@ -35,7 +35,7 @@ function Hola(props: any) {
 
 describe.each([
   { render: ssrRenderToDom }, //
-  { render: domRender }, //
+  // { render: domRender }, //
 ])('$render.name: component', ({ render }) => {
   it('should render component', async () => {
     const MyComp = component$(() => {
@@ -1256,7 +1256,7 @@ describe.each([
       );
     });
 
-    it('should bind checked attribute', async () => {
+    it.only('should bind checked attribute', async () => {
       const BindCmp = component$(() => {
         const show = useSignal(false);
         return (
diff --git a/packages/qwik/src/core/use/use-computed.ts b/packages/qwik/src/core/use/use-computed.ts
index f449eb1d3cc..515d4d70fa8 100644
--- a/packages/qwik/src/core/use/use-computed.ts
+++ b/packages/qwik/src/core/use/use-computed.ts
@@ -1,4 +1,4 @@
-import { assertQrl } from '../shared/qrl/qrl-class';
+import { assertQrl } from '../shared/qrl/qrl-utils';
 import type { QRL } from '../shared/qrl/qrl.public';
 import { ComputedSignal, throwIfQRLNotResolved } from '../signal/signal';
 import type { ReadonlySignal, Signal } from '../signal/signal.public';
diff --git a/packages/qwik/src/core/use/use-lexical-scope.public.ts b/packages/qwik/src/core/use/use-lexical-scope.public.ts
index 099c3b2fd10..7557acf7072 100644
--- a/packages/qwik/src/core/use/use-lexical-scope.public.ts
+++ b/packages/qwik/src/core/use/use-lexical-scope.public.ts
@@ -1,7 +1,8 @@
 import { assertDefined } from '../shared/error/assert';
 import { getInvokeContext } from './use-core';
-import { assertQrl, type QRLInternal } from '../shared/qrl/qrl-class';
+import type { QRLInternal } from '../shared/qrl/qrl-class';
 import { _getQContainerElement, getDomContainer } from '../client/dom-container';
+import { assertQrl } from '../shared/qrl/qrl-utils';
 
 // <docs markdown="../readme.md#useLexicalScope">
 // !!DO NOT EDIT THIS COMMENT DIRECTLY!!!
diff --git a/packages/qwik/src/core/use/use-resource.ts b/packages/qwik/src/core/use/use-resource.ts
index 6041814faaa..6119690a2ed 100644
--- a/packages/qwik/src/core/use/use-resource.ts
+++ b/packages/qwik/src/core/use/use-resource.ts
@@ -1,5 +1,5 @@
 import { isServerPlatform } from '../shared/platform/platform';
-import { assertQrl } from '../shared/qrl/qrl-class';
+import { assertQrl } from '../shared/qrl/qrl-utils';
 import { type QRL } from '../shared/qrl/qrl.public';
 import { Fragment, _jsxSorted } from '../shared/jsx/jsx-runtime';
 import { invoke, newInvokeContext, untrack, useBindInvokeContext } from './use-core';
diff --git a/packages/qwik/src/core/use/use-styles.ts b/packages/qwik/src/core/use/use-styles.ts
index 031bbadb655..4a25e4968a8 100644
--- a/packages/qwik/src/core/use/use-styles.ts
+++ b/packages/qwik/src/core/use/use-styles.ts
@@ -2,7 +2,7 @@ import { type QRL } from '../shared/qrl/qrl.public';
 import { implicit$FirstArg } from '../shared/qrl/implicit_dollar';
 import { getScopedStyles } from '../shared/utils/scoped-stylesheet';
 import { useSequentialScope } from './use-sequential-scope';
-import { assertQrl } from '../shared/qrl/qrl-class';
+import { assertQrl } from '../shared/qrl/qrl-utils';
 import { isPromise } from '../shared/utils/promises';
 import { ComponentStylesPrefixContent } from '../shared/utils/markers';
 import { styleKey } from '../shared/utils/styles';
diff --git a/packages/qwik/src/core/use/use-task.ts b/packages/qwik/src/core/use/use-task.ts
index 29e0946a92e..36be84a5214 100644
--- a/packages/qwik/src/core/use/use-task.ts
+++ b/packages/qwik/src/core/use/use-task.ts
@@ -1,7 +1,8 @@
 import { getDomContainer } from '../client/dom-container';
 import type { VNode } from '../client/types';
 import { isServerPlatform } from '../shared/platform/platform';
-import { assertQrl, createQRL, type QRLInternal } from '../shared/qrl/qrl-class';
+import { createQRL, type QRLInternal } from '../shared/qrl/qrl-class';
+import { assertQrl } from '../shared/qrl/qrl-utils';
 import type { QRL } from '../shared/qrl/qrl.public';
 import { ChoreType } from '../shared/scheduler';
 import { type Container, type HostElement } from '../shared/types';
diff --git a/packages/qwik/src/core/use/use-visible-task.ts b/packages/qwik/src/core/use/use-visible-task.ts
index be2f1fe929f..c20904a6420 100644
--- a/packages/qwik/src/core/use/use-visible-task.ts
+++ b/packages/qwik/src/core/use/use-visible-task.ts
@@ -1,5 +1,5 @@
 import { isServerPlatform } from '../shared/platform/platform';
-import { assertQrl } from '../shared/qrl/qrl-class';
+import { assertQrl } from '../shared/qrl/qrl-utils';
 import type { QRL } from '../shared/qrl/qrl.public';
 import { ChoreType } from '../shared/scheduler';
 import { useSequentialScope } from './use-sequential-scope';
diff --git a/packages/qwik/src/core/vnode_fromJSX.ts b/packages/qwik/src/core/vnode_fromJSX.ts
new file mode 100644
index 00000000000..84327097e42
--- /dev/null
+++ b/packages/qwik/src/core/vnode_fromJSX.ts
@@ -0,0 +1,59 @@
+import type { JSXOutput, _ElementVNode, _QDocument, _VirtualVNode } from '@builder.io/qwik';
+import {
+  vnode_applyJournal,
+  vnode_getFirstChild,
+  vnode_getParent,
+  vnode_insertBefore,
+  vnode_newText,
+  vnode_newUnMaterializedElement,
+  vnode_setAttr,
+  type VNodeJournal,
+} from './client/vnode';
+import { createDocument } from '../testing/document';
+import { walkJSX } from '../testing/vdom-diff.unit-util';
+
+/** @public */
+
+export function vnode_fromJSX(jsx: JSXOutput) {
+  const doc = createDocument() as _QDocument;
+  doc.qVNodeData = new WeakMap();
+  const vBody = vnode_newUnMaterializedElement(doc.body);
+  let vParent: _ElementVNode | _VirtualVNode = vBody;
+  const journal: VNodeJournal = [];
+  walkJSX(jsx, {
+    enter: (jsx) => {
+      const type = jsx.type;
+      if (typeof type === 'string') {
+        const child = vnode_newUnMaterializedElement(doc.createElement(type));
+        vnode_insertBefore(journal, vParent, child, null);
+
+        // TODO(hack): jsx.props is an empty object
+        const props = jsx.varProps;
+        for (const key in props) {
+          if (Object.prototype.hasOwnProperty.call(props, key)) {
+            vnode_setAttr(journal, child, key, String(props[key]));
+          }
+        }
+        if (jsx.key != null) {
+          vnode_setAttr(journal, child, 'q:key', String(jsx.key));
+        }
+        vParent = child;
+      } else {
+        throw new Error('Unknown type:' + type);
+      }
+    },
+    leave: () => {
+      vParent = vnode_getParent(vParent) as any;
+    },
+    text: (value) => {
+      vnode_insertBefore(
+        journal,
+        vParent,
+        vnode_newText(doc.createTextNode(String(value)), String(value)),
+        null
+      );
+    },
+  });
+  vnode_applyJournal(journal);
+  return { vParent, vNode: vnode_getFirstChild(vParent), document: doc };
+}
diff --git a/packages/qwik/src/optimizer/src/plugins/plugin.ts b/packages/qwik/src/optimizer/src/plugins/plugin.ts
index 74c165bfdc3..3b36c14c048 100644
--- a/packages/qwik/src/optimizer/src/plugins/plugin.ts
+++ b/packages/qwik/src/optimizer/src/plugins/plugin.ts
@@ -688,7 +688,7 @@ export function createPlugin(optimizerOptions: OptimizerOptions = {}) {
       const module = newOutput.modules.find((mod) => !isAdditionalFile(mod))!;
 
       // uncomment to show transform results
-      // debug({ isServer, strip }, transformOpts, newOutput);
+      debug({ isServer, strip }, transformOpts, newOutput);
       diagnosticsCallback(newOutput.diagnostics, optimizer, srcDir);
 
       if (isServer) {
@@ -941,9 +941,6 @@ export function parseId(originalId: string) {
   };
 }
 
-export const getSymbolHash = (symbolName: string) =>
-  /_([a-z0-9]+)($|\.js($|\?))/.exec(symbolName)?.[1];
-
 const TRANSFORM_EXTS = {
   '.jsx': true,
   '.ts': true,
diff --git a/packages/qwik/src/optimizer/src/plugins/vite-dev-server.ts b/packages/qwik/src/optimizer/src/plugins/vite-dev-server.ts
index 49850864a31..e3d0425eaae 100644
--- a/packages/qwik/src/optimizer/src/plugins/vite-dev-server.ts
+++ b/packages/qwik/src/optimizer/src/plugins/vite-dev-server.ts
@@ -13,7 +13,7 @@ import imageDevTools from './image-size-runtime.html?raw';
 import clickToComponent from './click-to-component.html?raw';
 import perfWarning from './perf-warning.html?raw';
 import errorHost from './error-host.html?raw';
-import { SYNC_QRL } from '../../../core/shared/qrl/qrl-class';
+import { SYNC_QRL } from '../../../core/shared/qrl/qrl-utils';
 
 function getOrigin(req: IncomingMessage) {
   const { PROTOCOL_HEADER, HOST_HEADER } = process.env;
diff --git a/packages/qwik/src/server/platform.ts b/packages/qwik/src/server/platform.ts
index e8192317381..0b834fc2471 100644
--- a/packages/qwik/src/server/platform.ts
+++ b/packages/qwik/src/server/platform.ts
@@ -2,12 +2,10 @@ import type { SerializeDocumentOptions } from './types';
 import { setPlatform } from '@builder.io/qwik';
 import type { ResolvedManifest } from '@builder.io/qwik/optimizer';
 import type { CorePlatformServer } from './qwik-types';
+import { SYNC_QRL } from './qwik-copy';
 
 declare const require: (module: string) => Record<string, any>;
 
-// Make sure this value is same as value in `qrl-class.ts`
-const SYNC_QRL = '<sync>';
-
 export function createPlatform(
   opts: SerializeDocumentOptions,
   resolvedManifest: ResolvedManifest | undefined
diff --git a/packages/qwik/src/server/qwik-copy.ts b/packages/qwik/src/server/qwik-copy.ts
index 9479462c690..94d06b4ae33 100644
--- a/packages/qwik/src/server/qwik-copy.ts
+++ b/packages/qwik/src/server/qwik-copy.ts
@@ -9,8 +9,8 @@
  *   ensuring that this rule is followed, this file is the only place where relative `../` imports
  *   of types only are allowed.
  *
- *   Sum code we are OK by importing and making a copy because it will have no adverse affect. This
- *   file lists code which we are OK to have duplicated.
+ *   Some code is OK to import and make a copy of because it will have no adverse affect. This file
+ *   lists code which we are OK to have duplicated.
  */
 
 export { serializeAttribute } from '../core/shared/utils/styles';
@@ -45,14 +45,14 @@ export {
   NON_SERIALIZABLE_MARKER_PREFIX,
 } from '../core/shared/utils/markers';
 export { maybeThen } from '../core/shared/utils/promises';
-export { mapApp_remove, mapArray_get, mapArray_set } from '../core/client/vnode';
+export { mapApp_remove, mapArray_get, mapArray_set } from '../core/client/mapArray';
 export {
   convertStyleIdsToString,
   getScopedStyleIdsAsPrefix,
   isClassAttr,
 } from '../core/shared/utils/scoped-styles';
 export { DEBUG_TYPE, VirtualType, QContainerValue } from '../core/shared/types';
-export { VNodeDataChar } from '../core/shared/vnode-data-types';
-export { VNodeDataSeparator } from '../core/shared/vnode-data-types';
+export { VNodeDataChar, VNodeDataSeparator } from '../core/shared/vnode-data-types';
 export { escapeHTML } from '../core/shared/utils/character-escaping';
 export { getValidManifest } from '../optimizer/src/manifest';
+export { SYNC_QRL } from '../core/shared/qrl/qrl-utils';
diff --git a/packages/qwik/src/server/ssr-container.ts b/packages/qwik/src/server/ssr-container.ts
index d514c9558f0..c2e40daab99 100644
--- a/packages/qwik/src/server/ssr-container.ts
+++ b/packages/qwik/src/server/ssr-container.ts
@@ -50,22 +50,22 @@ import {
   escapeHTML,
   Q_PROPS_SEPARATOR,
 } from './qwik-copy';
-import {
-  type ContextId,
-  type HostElement,
-  type SSRContainer as ISSRContainer,
-  type ISsrComponentFrame,
-  type ISsrNode,
-  type JSXChildren,
-  type JSXOutput,
-  type NodePropData,
-  type SerializationContext,
-  type SsrAttrKey,
-  type SsrAttrValue,
-  type SsrAttrs,
-  type StreamWriter,
-  type SymbolToChunkResolver,
-  type ValueOrPromise,
+import type {
+  ContextId,
+  HostElement,
+  SSRContainer as ISSRContainer,
+  ISsrComponentFrame,
+  ISsrNode,
+  JSXChildren,
+  JSXOutput,
+  NodePropData,
+  SerializationContext,
+  SsrAttrKey,
+  SsrAttrValue,
+  SsrAttrs,
+  StreamWriter,
+  SymbolToChunkResolver,
+  ValueOrPromise,
 } from './qwik-types';
 import { Q_FUNCS_PREFIX } from './ssr-render';
 import type { PrefetchResource, RenderOptions, RenderToStreamResult } from './types';
@@ -1126,10 +1126,10 @@ class SSRContainer extends _SharedContainer implements ISSRContainer {
 
         value = serializeAttribute(key, value, styleScopedId);
 
-        if (value != null && value !== false) {
+        if (value != null) {
           this.write(' ');
           this.write(key);
-          if (value !== true) {
+          if (value !== '') {
             this.write('="');
             const strValue = escapeHTML(String(value));
             this.write(strValue);
diff --git a/packages/qwik/src/server/vnode-data.ts b/packages/qwik/src/server/vnode-data.ts
index 4b7b943f837..a80450de294 100644
--- a/packages/qwik/src/server/vnode-data.ts
+++ b/packages/qwik/src/server/vnode-data.ts
@@ -1,4 +1,4 @@
-import { type ISsrNode, type SsrAttrs } from './qwik-types';
+import type { ISsrNode, SsrAttrs } from './qwik-types';
 import { SsrNode, type SsrNodeType } from './ssr-node';
 import type { CleanupQueue } from './ssr-container';
 
diff --git a/packages/qwik/src/testing/extend-expect.ts b/packages/qwik/src/testing/extend-expect.ts
new file mode 100644
index 00000000000..5def5accced
--- /dev/null
+++ b/packages/qwik/src/testing/extend-expect.ts
@@ -0,0 +1,31 @@
+import { expect } from 'vitest';
+import { _diffJsxVNode } from '@builder.io/qwik';
+
+import type { _VNode } from '../core/internal';
+import type { JSXNode, JSXOutput } from '../core/shared/jsx/types/jsx-node';
+
+expect.extend({
+  toMatchVDOM(this: { isNot: boolean }, received: _VNode, expected: JSXNode) {
+    const { isNot } = this;
+    const diffs = diffJsxVNode(received, expected);
+    return {
+      pass: isNot ? diffs.length !== 0 : diffs.length === 0,
+      message: () => diffs.join('\n'),
+    };
+  },
+
+  async toMatchDOM(this: { isNot: boolean }, received: HTMLElement, expected: JSXOutput) {
+    const { isNot } = this;
+    if (!received) {
+      return {
+        pass: false,
+        message: () => 'Missing element',
+      };
+    }
+    const diffs = await diffNode(received, expected);
+    return {
+      pass: isNot ? diffs.length !== 0 : diffs.length === 0,
+      message: () => diffs.join('\n'),
+    };
+  },
+});
diff --git a/packages/qwik/src/testing/qwik-copy.ts b/packages/qwik/src/testing/qwik-copy.ts
new file mode 100644
index 00000000000..52dea05e041
--- /dev/null
+++ b/packages/qwik/src/testing/qwik-copy.ts
@@ -0,0 +1,3 @@
+export { attrsEqual, getJSXChildren, jsxToHTML } from '../core/client/diffJsx-utils';
+export { isText } from '../core/shared/utils/element';
+export { serializeBooleanOrNumberAttribute } from '../core/shared/utils/styles';
diff --git a/packages/qwik/src/testing/rendering.unit-util.tsx b/packages/qwik/src/testing/rendering.unit-util.tsx
index ad52fda4441..8d648f133a9 100644
--- a/packages/qwik/src/testing/rendering.unit-util.tsx
+++ b/packages/qwik/src/testing/rendering.unit-util.tsx
@@ -6,9 +6,8 @@ import type {
   _VNode,
   _VirtualVNode,
 } from '@builder.io/qwik';
-import { _getDomContainer, componentQrl, type OnRenderFn } from '@builder.io/qwik';
+import { render, _getDomContainer, componentQrl, type OnRenderFn } from '@builder.io/qwik';
 import { expect } from 'vitest';
-import { render } from '../core/client/dom-render';
 import {
   vnode_getAttr,
   vnode_getFirstChild,
@@ -46,13 +45,14 @@ export async function domRender(
   opts: {
     /// Print debug information to console.
     debug?: boolean;
+    document?: Document;
   } = {}
 ) {
-  const document = createDocument();
-  await render(document.body, jsx);
+  const doc = opts.document || document;
+  await render(doc.body, jsx);
   await getTestPlatform().flush();
-  const getStyles = getStylesFactory(document);
-  const container = _getDomContainer(document.body);
+  const getStyles = getStylesFactory(doc);
+  const container = _getDomContainer(doc.body);
   if (opts.debug) {
     console.log('========================================================');
     console.log('------------------------- CSR --------------------------');
@@ -61,10 +61,10 @@ export async function domRender(
     console.log('--------------------------------------------------------');
   }
   return {
-    document,
+    document: doc,
     container,
     vNode: vnode_getFirstChild(container.rootVNode),
-    getStyles: getStylesFactory(document),
+    getStyles: getStylesFactory(doc),
   };
 }
 
@@ -118,11 +118,11 @@ export async function ssrRenderToDom(
     setPlatform(platform);
   }
 
-  const document = createDocument({ html });
-  const containerElement = document.querySelector('[q\\:container]') as _ContainerElement;
-  emulateExecutionOfQwikFuncs(document);
+  const doc = createDocument({ html });
+  const containerElement = doc.querySelector('[q\\:container]') as _ContainerElement;
+  emulateExecutionOfQwikFuncs(doc);
   const container = _getDomContainer(containerElement) as _DomContainer;
-  const getStyles = getStylesFactory(document);
+  const getStyles = getStylesFactory(doc);
   if (opts.debug) {
     console.log('========================================================');
     console.log('------------------------- SSR --------------------------');
@@ -146,22 +146,8 @@ export async function ssrRenderToDom(
   }
   const containerVNode = opts.raw
     ? container.rootVNode
-    : vnode_getVNodeForChildNode(container.rootVNode, document.body);
-  return { container, document, vNode: vnode_getFirstChild(containerVNode)!, getStyles };
-}
-
-/** @public */
-export function emulateExecutionOfQwikFuncs(document: Document) {
-  const qFuncs = document.body.querySelector('[q\\:func]');
-  const containerElement = document.querySelector(QContainerSelector) as _ContainerElement;
-  const hash = containerElement.getAttribute(QInstanceAttr);
-  if (qFuncs && hash) {
-    let code = qFuncs.textContent || '';
-    code = code.replace(Q_FUNCS_PREFIX.replace('HASH', hash), '');
-    if (code) {
-      (document as any)[QFuncsPrefix + hash] = eval(code);
-    }
-  }
+    : vnode_getVNodeForChildNode(container.rootVNode, doc.body);
+  return { container, document: doc, vNode: vnode_getFirstChild(containerVNode)!, getStyles };
 }
 
 function renderStyles(getStyles: () => Record<string, string | string[]>) {
@@ -195,6 +181,20 @@ function getHostVNode(vElement: _VNode | null) {
   return vElement;
 }
 
+/** @public */
+export function emulateExecutionOfQwikFuncs(document: Document) {
+  const qFuncs = document.body.querySelector('[q\\:func]');
+  const containerElement = document.querySelector(QContainerSelector) as _ContainerElement;
+  const hash = containerElement.getAttribute(QInstanceAttr);
+  if (qFuncs && hash) {
+    let code = qFuncs.textContent || '';
+    code = code.replace(Q_FUNCS_PREFIX.replace('HASH', hash), '');
+    if (code) {
+      (document as any)[QFuncsPrefix + hash] = eval(code);
+    }
+  }
+}
+
 export const ErrorProvider = Object.assign(
   componentQrl(
     inlinedQrl(() => {
diff --git a/packages/qwik/src/testing/vdom-diff.unit-util.ts b/packages/qwik/src/testing/vdom-diff.unit-util.ts
index 8f24864b62a..637438d92b3 100644
--- a/packages/qwik/src/testing/vdom-diff.unit-util.ts
+++ b/packages/qwik/src/testing/vdom-diff.unit-util.ts
@@ -1,223 +1,15 @@
-import type {
-  JSXNode,
-  JSXOutput,
-  _ElementVNode,
-  _QDocument,
-  _Stringifiable,
-  _TextVNode,
-  _VNode,
-  _VirtualVNode,
-} from '@builder.io/qwik';
-import { Fragment, _isJSXNode, _isStringifiable, isSignal } from '@builder.io/qwik';
-import { expect } from 'vitest';
-import {
-  vnode_applyJournal,
-  vnode_getAttr,
-  vnode_getAttrKeys,
-  vnode_getElementName,
-  vnode_getFirstChild,
-  vnode_getNextSibling,
-  vnode_getNode,
-  vnode_getParent,
-  vnode_getText,
-  vnode_insertBefore,
-  vnode_isElementVNode,
-  vnode_isTextVNode,
-  vnode_isVirtualVNode,
-  vnode_newText,
-  vnode_newUnMaterializedElement,
-  vnode_setAttr,
-  type VNodeJournal,
-} from '../core/client/vnode';
-
+import type { JSXNode, JSXOutput, _Stringifiable } from '@builder.io/qwik';
+import { _isJSXNode, _isStringifiable, isSignal } from '@builder.io/qwik';
 import { format } from 'prettier';
-import { serializeBooleanOrNumberAttribute } from '../core/shared/utils/styles';
-import { isText } from '../core/shared/utils/element';
-import {
-  isHtmlAttributeAnEventName,
-  isJsxPropertyAnEventName,
-} from '../core/shared/utils/event-names';
-import { createDocument } from './document';
+import './extend-expect';
 import { isElement } from './html';
-import { Q_PROPS_SEPARATOR } from '../core/shared/utils/markers';
-
-expect.extend({
-  toMatchVDOM(this: { isNot: boolean }, received: _VNode, expected: JSXNode) {
-    const { isNot } = this;
-    const diffs = diffJsxVNode(received, expected);
-    return {
-      pass: isNot ? diffs.length !== 0 : diffs.length === 0,
-      message: () => diffs.join('\n'),
-    };
-  },
-
-  async toMatchDOM(this: { isNot: boolean }, received: HTMLElement, expected: JSXOutput) {
-    const { isNot } = this;
-    if (!received) {
-      return {
-        pass: false,
-        message: () => 'Missing element',
-      };
-    }
-    const diffs = await diffNode(received, expected);
-    return {
-      pass: isNot ? diffs.length !== 0 : diffs.length === 0,
-      message: () => diffs.join('\n'),
-    };
-  },
-});
-
-function diffJsxVNode(received: _VNode, expected: JSXNode | string, path: string[] = []): string[] {
-  if (!received) {
-    return [path.join(' > ') + ' missing'];
-  }
-  const diffs: string[] = [];
-  if (typeof expected === 'string') {
-    const receivedText = vnode_isTextVNode(received) ? vnode_getText(received as _TextVNode) : null;
-    if (expected !== receivedText) {
-      diffs.push(path.join(' > '));
-      diffs.push('EXPECTED', JSON.stringify(expected));
-      diffs.push('RECEIVED:', JSON.stringify(receivedText));
-    }
-  } else {
-    path.push(tagToString(expected.type));
-    const receivedTag = vnode_isElementVNode(received)
-      ? vnode_getElementName(received as _ElementVNode)
-      : vnode_isVirtualVNode(received)
-        ? Fragment
-        : undefined;
-    const isTagSame = String(expected.type).toLowerCase() == String(receivedTag).toLowerCase();
-    if (!isTagSame) {
-      diffs.push(path.join(' > ') + ' expecting=' + expected.type + ' received=' + receivedTag);
-    }
-    const allProps: string[] = [];
-    expected.varProps && propsAdd(allProps, Object.keys(expected.varProps));
-    expected.constProps && propsAdd(allProps, Object.keys(expected.constProps));
-    const receivedElement = vnode_isElementVNode(received)
-      ? (vnode_getNode(received) as Element)
-      : null;
-    propsAdd(allProps, vnode_isElementVNode(received) ? vnode_getAttrKeys(received).sort() : []);
-    receivedElement && propsAdd(allProps, constPropsFromElement(receivedElement));
-    allProps.sort();
-    allProps.forEach((prop) => {
-      if (isJsxPropertyAnEventName(prop) || isHtmlAttributeAnEventName(prop)) {
-        return;
-      }
-      // we need this, because Domino lowercases all attributes for `element.attributes`
-      const propLowerCased = prop.toLowerCase();
-      let receivedValue =
-        vnode_getAttr(received, prop) ||
-        vnode_getAttr(received, propLowerCased) ||
-        receivedElement?.getAttribute(prop) ||
-        receivedElement?.getAttribute(propLowerCased);
-      let expectedValue =
-        prop === 'key' || prop === 'q:key' ? (expected.key ?? receivedValue) : expected.props[prop];
-      if (typeof receivedValue === 'boolean' || typeof receivedValue === 'number') {
-        receivedValue = serializeBooleanOrNumberAttribute(receivedValue);
-      }
-      if (typeof expectedValue === 'number') {
-        expectedValue = serializeBooleanOrNumberAttribute(expectedValue);
-      }
-      if (!attrsEqual(expectedValue, receivedValue)) {
-        diffs.push(`${path.join(' > ')}: [${prop}]`);
-        diffs.push('  EXPECTED: ' + JSON.stringify(expectedValue));
-        diffs.push('  RECEIVED: ' + JSON.stringify(receivedValue));
-      }
-    });
-    const receivedChildren = getVNodeChildren(received);
-    const expectedChildren = getJSXChildren(expected);
-    if (receivedChildren.length === expectedChildren.length) {
-      for (let i = 0; i < receivedChildren.length; i++) {
-        const receivedChild = receivedChildren[i];
-        const expectedChild = expectedChildren[i];
-        diffs.push(...diffJsxVNode(receivedChild, expectedChild, path));
-      }
-    } else {
-      diffs.push(
-        `${path.join(' > ')} expecting ${expectedChildren.length} children but was ${
-          receivedChildren.length
-        }`
-      );
-      diffs.push('EXPECTED', jsxToHTML(expected, '  '));
-      diffs.push('RECEIVED:', vnodeToHTML(received, '  '));
-    }
-    path.pop();
-  }
-  return diffs;
-}
-function getJSXChildren(jsx: JSXNode): JSXNode[] {
-  const children = jsx.children;
-  if (Array.isArray(children)) {
-    return children as any;
-  } else if (children != null) {
-    return [children] as any;
-  }
-  return [];
-}
-
-function getVNodeChildren(vNode: _VNode): _VNode[] {
-  const children: _VNode[] = [];
-  let child = vnode_getFirstChild(vNode);
-  while (child) {
-    if (!shouldSkip(child)) {
-      children.push(child);
-    }
-    child = vnode_getNextSibling(child);
-  }
-  return children;
-}
-export function jsxToHTML(jsx: JSXNode, pad: string = ''): string {
-  const html: string[] = [];
-  if (jsx.type) {
-    html.push(pad, '<', tagToString(jsx.type), '>\n');
-    getJSXChildren(jsx).forEach((jsx) => {
-      html.push(jsxToHTML(jsx, pad + '  '));
-    });
-    html.push(pad, '</', tagToString(jsx.type), '>\n');
-  } else {
-    html.push(pad, JSON.stringify(jsx), '\n');
-  }
-  return html.join('');
-}
-
-export function vnodeToHTML(vNode: _VNode | null, pad: string = ''): string {
-  const html: string[] = [];
-  while (vNode) {
-    html.push(
-      pad +
-        vNode
-          .toString()
-          .split('\n')
-          .join('\n' + pad)
-    );
-    while (shouldSkip((vNode = vnode_getNextSibling(vNode!)))) {
-      // skip
-    }
-  }
-  return html.join('');
-}
-
-function tagToString(tag: any): string {
-  if (tag === Fragment) {
-    return 'Fragment';
-  }
-  return String(tag);
-}
-
-function shouldSkip(vNode: _VNode | null) {
-  if (vNode && vnode_isElementVNode(vNode)) {
-    const tag = vnode_getElementName(vNode);
-    if (
-      tag === 'script' &&
-      (vnode_getAttr(vNode, 'type') === 'qwik/vnode' ||
-        vnode_getAttr(vNode, 'type') === 'x-qwik/vnode' ||
-        vnode_getAttr(vNode, 'type') === 'qwik/state')
-    ) {
-      return true;
-    }
-  }
-  return false;
-}
+import {
+  attrsEqual,
+  getJSXChildren,
+  isText,
+  jsxToHTML,
+  serializeBooleanOrNumberAttribute,
+} from './qwik-copy';
 
 /** @public */
 export function walkJSX(
@@ -256,80 +48,9 @@ export function walkJSX(
   }
 }
 
-/** @public */
-export function vnode_fromJSX(jsx: JSXOutput) {
-  const doc = createDocument() as _QDocument;
-  doc.qVNodeData = new WeakMap();
-  const vBody = vnode_newUnMaterializedElement(doc.body);
-  let vParent: _ElementVNode | _VirtualVNode = vBody;
-  const journal: VNodeJournal = [];
-  walkJSX(jsx, {
-    enter: (jsx) => {
-      const type = jsx.type;
-      if (typeof type === 'string') {
-        const child = vnode_newUnMaterializedElement(doc.createElement(type));
-        vnode_insertBefore(journal, vParent, child, null);
-
-        // TODO(hack): jsx.props is an empty object
-        const props = jsx.varProps;
-        for (const key in props) {
-          if (Object.prototype.hasOwnProperty.call(props, key)) {
-            vnode_setAttr(journal, child, key, String(props[key]));
-          }
-        }
-        if (jsx.key != null) {
-          vnode_setAttr(journal, child, 'q:key', String(jsx.key));
-        }
-        vParent = child;
-      } else {
-        throw new Error('Unknown type:' + type);
-      }
-    },
-    leave: (jsx) => {
-      vParent = vnode_getParent(vParent) as any;
-    },
-    text: (value) => {
-      vnode_insertBefore(
-        journal,
-        vParent,
-        vnode_newText(doc.createTextNode(String(value)), String(value)),
-        null
-      );
-    },
-  });
-  vnode_applyJournal(journal);
-  return { vParent, vNode: vnode_getFirstChild(vParent), document: doc };
-}
-function constPropsFromElement(element: Element) {
-  const props: string[] = [];
-  for (let i = 0; i < element.attributes.length; i++) {
-    const attr = element.attributes[i];
-    if (attr.name !== '' && attr.name !== Q_PROPS_SEPARATOR) {
-      props.push(attr.name);
-    }
-  }
-  props.sort();
-  return props;
-}
-
-function propsAdd(existing: string[], incoming: string[]) {
-  for (const prop of incoming) {
-    if (prop !== 'children') {
-      let found = false;
-      for (let i = 0; i < existing.length; i++) {
-        if (existing[i].toLowerCase() === prop.toLowerCase()) {
-          found = true;
-          break;
-        }
-      }
-      if (!found) {
-        existing.push(prop);
-      }
-    }
-  }
-}
+const formatOptions = { parser: 'html', htmlWhitespaceSensitivity: 'ignore' as const };
 
-async function diffNode(received: HTMLElement, expected: JSXOutput): Promise<string[]> {
+export async function diffNode(received: HTMLElement, expected: JSXOutput): Promise<string[]> {
   const diffs: string[] = [];
   const nodePath: (Node | null)[] = [received];
   const path: string[] = [];
@@ -390,9 +111,7 @@ async function diffNode(received: HTMLElement, expected: JSXOutput): Promise<str
       );
       if (receivedChildren.length !== expectedChildren.length) {
         diffs.push(
-          `${path.join(' > ')} expecting ${expectedChildren.length} children but was ${
-            receivedChildren.length
-          }`
+          `${path.join(' > ')} expecting ${expectedChildren.length} children but was ${receivedChildren.length}`
         );
         diffs.push('EXPECTED', jsxToHTML(jsx, '  '));
         diffs.push('RECEIVED:', await format(element.outerHTML, formatOptions));
@@ -436,7 +155,7 @@ async function diffNode(received: HTMLElement, expected: JSXOutput): Promise<str
   return diffs;
 }
 
-function combineAdjacentTextNodes(arr: ChildNode[], removeEmptyTextNode: boolean) {
+export function combineAdjacentTextNodes(arr: ChildNode[], removeEmptyTextNode: boolean) {
   const result: ChildNode[] = [];
   let textElement: ChildNode | null = null;
 
@@ -471,15 +190,3 @@ function combineAdjacentTextNodes(arr: ChildNode[], removeEmptyTextNode: boolean
 
   return result;
 }
-
-const formatOptions = { parser: 'html', htmlWhitespaceSensitivity: 'ignore' as const };
-function attrsEqual(expectedValue: any, receivedValue: any) {
-  const isEqual =
-    typeof expectedValue == 'boolean'
-      ? expectedValue
-        ? receivedValue !== null
-        : receivedValue === null || receivedValue === 'false'
-      : expectedValue == receivedValue;
-  // console.log('attrsEqual', expectedValue, receivedValue, isEqual);
-  return isEqual;
-}
diff --git a/scripts/build.ts b/scripts/build.ts
index 55bed44a4ac..c3771da0728 100644
--- a/scripts/build.ts
+++ b/scripts/build.ts
@@ -69,7 +69,6 @@ export async function build(config: BuildConfig) {
       } else {
         emptyDir(config.distQwikPkgDir);
       }
-
       await Promise.all([
         submoduleCore(config),
         submoduleQwikLoader(config),
@@ -188,7 +187,7 @@ export async function build(config: BuildConfig) {
       });
     }
   } catch (e: any) {
-    panic(String(e ? e.stack || e : 'Error'));
+    panic(e);
   }
 }
 
diff --git a/scripts/submodule-server.ts b/scripts/submodule-server.ts
index db5d030ca72..1b7e2b5c2b0 100644
--- a/scripts/submodule-server.ts
+++ b/scripts/submodule-server.ts
@@ -24,7 +24,13 @@ export async function submoduleServer(config: BuildConfig) {
     bundle: true,
     platform: 'node',
     target,
-    external: ['@builder.io/qwik', '@builder.io/qwik-dom', '@builder.io/qwik/build'],
+    external: [
+      '@builder.io/qwik',
+      '@builder.io/qwik-dom',
+      '@builder.io/qwik/build',
+      // uncomment this if you want to find what imports qwik-external
+      // '@builder.io/qwik-external',
+    ],
   };
 
   const esm = build({
@@ -32,7 +38,20 @@ export async function submoduleServer(config: BuildConfig) {
     format: 'esm',
     banner: { js: getBanner('@builder.io/qwik/server', config.distVersion) },
     outExtension: { '.js': '.mjs' },
-    plugins: [importPath(/^@builder\.io\/qwik$/, '@builder.io/qwik'), qwikDomPlugin],
+    plugins: [
+      // uncomment this if you want to find what imports qwik-external
+      // {
+      //   name: 'spy-resolve',
+      //   setup(build) {
+      //     build.onResolve({ filter: /./ }, (args) => {
+      //       console.log('spy-resolve', args);
+      //       return undefined;
+      //     });
+      //   },
+      // },
+      importPath(/^@builder\.io\/qwik$/, '@builder.io/qwik'),
+      qwikDomPlugin,
+    ],
     define: {
       ...(await inlineQwikScriptsEsBuild(config)),
       'globalThis.IS_CJS': 'false',
diff --git a/scripts/submodule-testing.ts b/scripts/submodule-testing.ts
index 34c883b5357..12e4016fbe0 100644
--- a/scripts/submodule-testing.ts
+++ b/scripts/submodule-testing.ts
@@ -1,4 +1,4 @@
-import { getBanner, importPath, nodeTarget, target } from './util';
+import { getBanner, importPath, nodeTarget, target, externalImportNoEffects } from './util';
 import { build, type BuildOptions } from 'esbuild';
 import { type BuildConfig, type PackageJSON } from './util';
 import { join } from 'node:path';
@@ -14,9 +14,9 @@ export async function submoduleTesting(config: BuildConfig) {
     sourcemap: config.dev,
     bundle: true,
     target,
-    external: ['@builder.io/qwik/build', 'prettier', 'vitest', '@builder.io/qwik-external'],
     platform: 'node',
-    // external: [...nodeBuiltIns],
+    // uncomment this if you want to find what imports qwik-external
+    external: ['@builder.io/qwik-external'],
   };
 
   const esm = build({
@@ -25,9 +25,20 @@ export async function submoduleTesting(config: BuildConfig) {
     banner: { js: getBanner('@builder.io/qwik/testing', config.distVersion) },
     outExtension: { '.js': '.mjs' },
     plugins: [
+      // uncomment this if you want to find what imports qwik-external
+      {
+        name: 'spy-resolve',
+        setup(build) {
+          build.onResolve({ filter: /./ }, (args) => {
+            console.log('spy-resolve', args);
+            return undefined;
+          });
+        },
+      },
       importPath(/^@builder\.io\/qwik$/, '../core.qwik.mjs'),
       importPath(/^@builder\.io\/qwik\/optimizer$/, '../optimizer.mjs'),
       importPath(/^@builder\.io\/qwik\/server$/, '../server.mjs'),
+      externalImportNoEffects(/^(@builder\.io\/qwik\/build|prettier|vitest)$/),
     ],
     define: {
       'globalThis.MODULE_EXT': `"mjs"`,
@@ -47,6 +58,7 @@ export async function submoduleTesting(config: BuildConfig) {
       importPath(/^@builder\.io\/qwik$/, '../core.qwik.cjs'),
       importPath(/^@builder\.io\/qwik\/optimizer$/, '../optimizer.cjs'),
       importPath(/^@builder\.io\/qwik\/server$/, '../server.cjs'),
+      externalImportNoEffects(/^(@builder\.io\/qwik\/build|prettier|vitest)$/),
     ],
     define: {
       'globalThis.MODULE_EXT': `"cjs"`,
diff --git a/scripts/util.ts b/scripts/util.ts
index a4da3b029b6..aff45181b0b 100644
--- a/scripts/util.ts
+++ b/scripts/util.ts
@@ -164,6 +164,22 @@ export function importPath(filter: RegExp, newModulePath: string) {
       build.onResolve({ filter }, () => ({
         path: newModulePath,
         external: true,
+        sideEffects: false,
+      }));
+    },
+  };
+  return plugin;
+}
+
+/** Esbuild plugin to mark an import as having external without side effects. */
+export function externalImportNoEffects(filter: RegExp) {
+  const plugin: Plugin = {
+    name: 'externalImportPlugin',
+    setup(build) {
+      build.onResolve({ filter }, ({ path }) => ({
+        path,
+        external: true,
+        sideEffects: false,
       }));
     },
   };
diff --git a/vitest.config.mts b/vitest.config.mts
index 57a62f6858d..a1b7478149b 100644
--- a/vitest.config.mts
+++ b/vitest.config.mts
@@ -1,6 +1,6 @@
 import { qwikVite } from '@builder.io/qwik/optimizer';
 import tsconfigPaths from 'vite-tsconfig-paths';
-import { defineConfig, configDefaults } from 'vitest/config';
+import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   plugins: [
@@ -10,6 +10,11 @@ export default defineConfig({
     }),
     tsconfigPaths({ ignoreConfigErrors: true }),
   ],
+  resolve: {
+    alias: {
+      '@builder.io/qwik-external': '@builder.io/qwik',
+    },
+  },
   test: {
     root: 'packages',
     include: ['**/*.spec.?(c|m)[jt]s?(x)', '**/*.unit.?(c|m)[jt]s?(x)', '!qwik/dist', '!*/lib'],